From 6d07596890c54a8b7cdfd14d8ebd4b4e9acefecd Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期二, 02 十二月 2025 14:22:47 +0800
Subject: [PATCH] 最新版本541200007
---
server/system_service/src/main/java/com/doumee/dao/business/model/Member.java | 55 +++++++++++--------------------------------------------
1 files changed, 11 insertions(+), 44 deletions(-)
diff --git a/server/system_service/src/main/java/com/doumee/dao/business/model/Member.java b/server/system_service/src/main/java/com/doumee/dao/business/model/Member.java
index 0234167..f805fbf 100644
--- a/server/system_service/src/main/java/com/doumee/dao/business/model/Member.java
+++ b/server/system_service/src/main/java/com/doumee/dao/business/model/Member.java
@@ -2,7 +2,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
-import com.doumee.core.model.LoginUserModel;
+import com.doumee.service.business.third.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -96,6 +96,8 @@
@JsonFormat(pattern = "yyyy-MM-dd")
@ExcelColumn(name="鍏ヨ亴鏃ユ湡",index =9,width = 10, dateFormat = "yyyy-MM-dd")
private Date jobDate;
+ @ApiModelProperty(value = "濮撳悕鎷奸煶棣栧瓧姣�")
+ private String pinyin;
@ApiModelProperty(value = "鍩硅缁撴潫鏃堕棿")
@TableField(exist = false)
@ExcelColumn(name="鍩硅缁撴潫鏃堕棿",index =10,width = 10, dateFormat = "yyyy-MM-dd")
@@ -128,99 +130,64 @@
private String code;
@ApiModelProperty(value = "璁垮骞撮緞")
private Date birthday;
-
-
@ApiModelProperty(value = "韬唤璇佸彿锛圡D4鍔犲瘑锛�")
private String idcardNo;
@ApiModelProperty(value = "淇敼鐨勮韩浠借瘉鍙� ")
@TableField(exist = false)
private String idcardNoNew;
-
-
@ApiModelProperty(value = "璇佷欢绫诲瀷 0韬唤璇� 1娓境璇佷欢 2鎶ょ収", example = "1")
private Integer idcardType;
@ApiModelProperty(value = "鏄惁鏄墿娴佸徃鏈� 0涓嶆槸 1鏄�", example = "1")
private Integer isDriver;
-
-
-
@ApiModelProperty(value = "鐝 0鐧界彮 1澶滅彮")
private Integer classes;
-
@ApiModelProperty(value = "鐘舵�� 0姝ｅ父 1绂佺敤 2鎷夐粦/鍐荤粨", example = "1")
private Integer status;
-
@ApiModelProperty(value = "娣诲姞浜虹紪鐮侊紙鑷叧鑱旓級", example = "1")
private Integer parentId;
-
@ApiModelProperty(value = "寰俊openid")
private String openid;
-
@ApiModelProperty(value = "椋炰功鏍囪瘑")
private String fsId;
-
@ApiModelProperty(value = "椋炰功鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�", example = "1")
private Integer fsStatus;
@ApiModelProperty(value = "椋炰功鏈�杩戝悓姝ユ椂闂�")
private Date fsDate;
-
@ApiModelProperty(value = "娴峰悍鏍囪瘑", example = "1")
private String hkId;
-
-
-
-
@ApiModelProperty(value = "娴峰悍鏈�杩戝悓姝ユ椂闂�")
private Date hkDate;
-
-
-
@ApiModelProperty(value = "宀椾綅缂栫爜锛屽叧鑱攑ositionbiao", example = "1")
private Integer positionId;
@ApiModelProperty(value = "ERP鏍囪瘑", example = "1")
private String erpId;
-
@ApiModelProperty(value = "ERP鍚屾鏃堕棿")
private Date erpDate;
-
@ApiModelProperty(value = "ERP鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�", example = "1")
private Integer erpStatus;
-
@ApiModelProperty(value = "閽夐拤鏍囪瘑", example = "1")
- private Integer ddId;
-
+ private String ddId;
@ApiModelProperty(value = "閽夐拤鍚屾鏃堕棿")
private Date ddDate;
-
@ApiModelProperty(value = "閽夐拤P鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�", example = "1")
private Integer ddStatus;
-
@ApiModelProperty(value = "鐧婚檰瀵嗙爜")
private String passward;
-
-
@ApiModelProperty(value = "鏄惁楂樼骇瀹℃壒浜� 0鍚� 1鏄�", example = "1")
private Integer highCheckor;
-
@ApiModelProperty(value = "闂ㄧ瑙掕壊缂栫爜锛堝叧鑱攄evice_role),澶氫釜鑻辨枃閫楀彿闅斿紑", example = "1")
private String roleId;
-
@ApiModelProperty(value = "闂ㄧ瑙掕壊鎺堟潈鏃堕棿")
private Date roleDate;
-
@ApiModelProperty(value = "ERP缁勭粐缂栫爜")
private String erpOrgId;
@ApiModelProperty(value = "璁垮鍏徃鍚嶇О")
private String visitCompanyName;
-
-
@ApiModelProperty(value = "鏈�鍚庢搷浣滀汉")
@TableField(exist = false)
private String editorName;
-
-
@ApiModelProperty(value = "缁勭粐绫诲瀷 0鍔冲姟鍏徃 1鍐呴儴缁勭粐 澶氫釜浠�,鍒嗗壊")
@TableField(exist = false)
private String companyTypes;
@@ -251,7 +218,6 @@
@ApiModelProperty(value = "鏈夋晥鏈熺被鍨� 0闀挎湡鏈夋晥 1鑷畾涔�",hidden = true )
@TableField(exist = false)
private Integer timeType;
- //鏆傛棤浣跨敤
@ApiModelProperty(value = "濮撳悕/鎵嬫満鍙�/宸ュ彿")
@TableField(exist = false)
private String keyword;
@@ -279,28 +245,29 @@
@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 String optRemark;
-
@ApiModelProperty(value = "system openid" , hidden = true)
@TableField(exist = false)
private String systemOpenid;
-
@ApiModelProperty(value = "鍩硅寮�濮嬫椂闂�")
@TableField(exist = false)
private Date trainStartTime;
-
@ApiModelProperty(value = "闂ㄧ缁勫悕绉伴泦鍚�")
@TableField(exist = false)
private List<String> roleNames;
-
@ApiModelProperty(value = "鏄惁鏌ヨ鍥哄畾浜哄憳锛�0=鍚︼紱1=鏄�" )
@TableField(exist = false)
private Integer querySpecial;
+ @ApiModelProperty(value = "鏄惁鏌ヨ閽ュ寵鏌滄牎楠屼汉鍛橈細0=鍚︼紱1=鏄�" )
+ @TableField(exist = false)
+ private Integer queryAuth;
+ @ApiModelProperty(value = "閮ㄩ棬缂栫爜闆嗗悎" )
+ @TableField(exist = false)
+ private List<Long> companyIdList;
+
}
--
Gitblit v1.9.3