From 2475ec4a6b3b85b8d783890da5508740319213f4 Mon Sep 17 00:00:00 2001
From: Jinquan_Ou <Jinquan@gdut.com>
Date: 星期一, 24 四月 2023 23:27:49 +0800
Subject: [PATCH] 456

---
 zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java |   49 ++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java b/zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java
index 1f5d063..645a115 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java
@@ -3,11 +3,14 @@
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
 import lombok.Data;
 import lombok.ToString;
 
 import java.io.Serializable;
 import java.time.LocalDate;
+import java.util.Date;
 
 /**
  * @Version 1.0
@@ -22,82 +25,109 @@
     private static final long serialVersionUID = 1L;
 
     @TableId(value = "user_id", type = IdType.AUTO)
-    private Integer userId;
+    private Long userId;
 
     /**
      * 濮撳悕
      */
+    @Excel(name="濮撳悕")
     private String nickName;
 
     /**
      * 鏇剧敤鍚�
      */
+    @Excel(name="鏇剧敤鍚�")
     private String oldName;
 
     /**
      * 鎬у埆
      */
+    @Excel(name="鎬у埆",readConverterExp = "0=濂�,1=鐢�")
     private Integer sex;
 
     /**
      * 鍥界睄
      */
+    @Excel(name="鍥界睄")
     private String nationality;
 
     /**
      * 姘戞棌
      */
+    @Excel(name="姘戞棌")
     private String nation;
 
     /**
-     * 濠氬Щ鐘跺喌--0锛氭湭濠氾紝1锛氬凡濠氾紝2锛氱濠�
+     * 濠氬Щ鐘跺喌 0锛氭湭濠氾紝1锛氬凡濠氾紝2锛氱濠�
      */
+    @Excel(name="濠氬Щ鐘跺喌",readConverterExp = "0=鏈,1=宸插,2=绂诲")
     private Integer maritalStatus;
 
     /**
      * 鏀挎不闈㈣矊
      */
+    @Excel(name="鏀挎不闈㈣矊")
     private String politicalOutlook;
 
     /**
      * 鐢佃瘽鍙风爜
      */
+    @Excel(name="鐢佃瘽鍙风爜")
     private String phoneNumber;
 
     /**
      * 韬唤璇佸彿
      */
+    @Excel(name="韬唤璇佸彿")
     private String idNum;
 
     /**
      * 鎴风睄鍦板潃
      */
+    @Excel(name="鎴风睄鍦板潃")
     private String locationAddress;
 
     /**
      * 甯镐綇鍦板潃
      */
+    @Excel(name="甯镐綇鍦板潃")
     private String alwaysAddress;
 
     /**
      * 鎴风睄鍦板叕瀹夋満鍏�
      */
+    @Excel(name="鎴风睄鍦板叕瀹夋満鍏�")
     private String locationPolice;
 
     /**
      * 甯镐綇鍦板叕瀹夋満鍏�
      */
+    @Excel(name="甯镐綇鍦板叕瀹夋満鍏�")
     private String alwaysPolice;
 
     /**
      * 鎵�鍦ㄥ崟浣�/瀛︽牎
      */
+    @Excel(name="鎵�鍦ㄥ崟浣�/瀛︽牎")
     private String unit;
 
     /**
      * 鑱屽姟/韬唤
      */
+    @Excel(name="鑱屽姟/韬唤")
     private String position;
+
+    /**
+     * 鎷ユ湁澶栫睄銆佸澶栨案涔呭眳鐣欐潈鎴栬�呴暱鏈熷眳鐣欒鍙殑鎯呭喌,1锛氭湁銆�0锛氭病鏈�
+     */
+    @Excel(name="鎷ユ湁澶栫睄銆佸澶栨案涔呭眳鐣欐潈鎴栬�呴暱鏈熷眳鐣欒鍙殑鎯呭喌",readConverterExp = "0=娌℃湁,1=鏈�")
+    private Integer outStatus;
+
+    /**
+     * 澶栫睄銆佸澶栫浉鍏宠瘉浠跺彿鐮�
+     */
+    @Excel(name = "澶栫睄銆佸澶栫浉鍏宠瘉浠跺彿鐮�")
+    private String idNo;
 
     /**
      * 鍥剧墖鍦板潃
@@ -117,11 +147,24 @@
     /**
      * 鍑虹敓骞存湀鏃�
      */
-    private LocalDate birth;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "鍑虹敓鏃堕棿", dateFormat = "yyyy-MM-dd")
+    private Date birth;
 
     /**
      * 涓汉鑳屾櫙鍥剧墖銆佽棰�
      */
     private String url;
 
+    /**
+     * 瀹跺涵id
+     */
+    private String familyId;
+
+    /**
+     * 鍏朵粬瀹跺涵鎺堟潈id
+     */
+    private String secondFamilyId;
+
+
 }

--
Gitblit v1.9.1