From 0411eeb918e0e09aa15cbefd0f9179932375757b Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 13 五月 2024 17:18:57 +0800
Subject: [PATCH] 最新版本

---
 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java |   37 +++++++++++++++++++++++++++++++++++--
 1 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java
index 23c54e5..23ff05f 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java
@@ -82,7 +82,6 @@
     @ApiModelProperty(value = "璁垮鍚嶇О/鍐呴儴浜哄憳")
     @ExcelColumn(name="璁垮鍚嶇О")
     private String name;
-
     @ApiModelProperty(value = "璁垮骞撮緞")
     @ExcelColumn(name="璁垮骞撮緞")
     @JsonFormat(pattern = "yyyy-MM-dd")
@@ -95,6 +94,9 @@
     @ApiModelProperty(value = "韬唤璇佸彿锛圡D4鍔犲瘑锛�")
     @ExcelColumn(name="韬唤璇佸彿锛圡D4鍔犲瘑锛�")
     private String idcardNo;
+    @ApiModelProperty(value = "淇敼鐨勮韩浠借瘉鍙� ")
+    @TableField(exist = false)
+    private String idcardNoNew;
 
     @ApiModelProperty(value = "璇佷欢鏄剧ず淇℃伅")
     @ExcelColumn(name="璇佷欢鏄剧ず淇℃伅")
@@ -146,12 +148,18 @@
     @ApiModelProperty(value = "娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝� 2鍚屾澶辫触 3涓嶇鍚堜笅鍙戞潯浠� 4绛夊緟鍒犻櫎鏉冮檺  ", example = "1")
     @ExcelColumn(name="娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝� 2鍚屾澶辫触 3涓嶇鍚堜笅鍙戞潯浠� 4绛夊緟鍒犻櫎鏉冮檺")
     private Integer hkStatus;
+    @ApiModelProperty(value = "娴峰悍鎺堟潈鐘舵�� 0鏈巿鏉� 1宸叉巿鏉�   ", example = "1")
+    @ExcelColumn(name="娴峰悍鎺堟潈鐘舵�� 0鏈巿鏉� 1宸叉巿鏉� ")
+    private Integer authStatus;
 
     @ApiModelProperty(value = "娴峰悍鏈�杩戝悓姝ユ椂闂�")
     @ExcelColumn(name="娴峰悍鏈�杩戝悓姝ユ椂闂�")
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date hkDate;
 
+    @ApiModelProperty(value = "鍦ㄨ亴鐘舵�� 0鍦ㄨ亴 1绂昏亴", example = "1")
+    @ExcelColumn(name="鍦ㄨ亴鐘舵�� 0鍦ㄨ亴 1绂昏亴")
+    private Integer workStatus;
     @ApiModelProperty(value = "ERP鏍囪瘑", example = "1")
     @ExcelColumn(name="ERP鏍囪瘑")
     private String erpId;
@@ -210,9 +218,18 @@
     @ApiModelProperty(value = "缁勭粐鍚嶇О")
     @TableField(exist = false)
     private String companyName;
+    @ApiModelProperty(value = "鏈�鍚庢搷浣滀汉")
+    @TableField(exist = false)
+    private String editorName;
+    @ApiModelProperty(value = "缁勭粐绫诲瀷")
+    @TableField(exist = false)
+    private Integer companyType;
     @ApiModelProperty(value = "缁勭粐缂栫爜璺緞")
     @TableField(exist = false)
     private String companyPath;
+    @ApiModelProperty(value = "璐熻矗浜虹紪鐮侊紙鍏宠仈member)")
+    @TableField(exist = false)
+    private Integer headId;
     @ApiModelProperty(value = "缁勭粐璺緞")
     @TableField(exist = false)
     private String companyNamePath;
@@ -235,6 +252,8 @@
     @ApiModelProperty(value = "濮撳悕/鎵嬫満鍙�/宸ュ彿")
     @TableField(exist = false)
     private String keyword;
+
+
 
     @ApiModelProperty(value = "鏄惁鏈変汉鑴革細0=鏃狅紱1=鏈夛紱")
     @TableField(exist = false)
@@ -259,8 +278,22 @@
     @ExcelColumn(name="闂ㄧ鏈夋晥鏈熺粨鏉�",index= 6,dateFormat = "yyyy-MM-dd")
     private Date endTime;
 
-
     @ApiModelProperty(value = "浜鸿劯鐓х墖瀹屾暣鍦板潃")
     @TableField(exist = false)
     private String faceImgFull;
+    @ApiModelProperty(value = "浜鸿劯鐓х墖瀹屾暣鍦板潃")
+    @TableField(exist = false)
+    private String imgurlFull;
+    @ApiModelProperty(value = "鏄惁涓荤 0鍚� 1鏄�", example = "1")
+    @TableField(exist = false)
+    private Integer headStatus;
+
+    @ApiModelProperty(value = "闂ㄧ瑙掕壊鍚嶇О")
+    @TableField(exist = false)
+    private String roleName;
+
+    @ApiModelProperty(value = "闂ㄧ缁勫悕绉伴泦鍚�")
+    @TableField(exist = false)
+    private List<String> roleNames;
+
 }

--
Gitblit v1.9.3