From 8ac30411bb33e406e0ed5a2b6e2edaf7ab59f11f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期六, 23 十一月 2024 17:10:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 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 b4664fe..c40d545 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
@@ -64,6 +64,10 @@
@ApiModelProperty(value = "绫诲瀷 0鍙告満浜哄憳 1鏅�氳瀹� 2鍐呴儴浜哄憳 3瀹㈡埛鑱旂郴浜�", example = "1")
private Integer type;
+ @ApiModelProperty(value = "韬唤 0鑰佹澘 1瓒呯骇绠＄悊鍛� 2鍛樺伐", example = "1")
+ @ExcelColumn(name="韬唤 0鑰佹澘 1瓒呯骇绠＄悊鍛� 2鍛樺伐")
+ private Integer highCheckor;
+
@ApiModelProperty(value = "璁垮鍚嶇О/鍐呴儴浜哄憳")
@ExcelColumn(name="濮撳悕",index = 1,width = 8)
private String name;
@@ -130,6 +134,9 @@
private Date birthday;
+ @ApiModelProperty(value = "瀹㈡埛缂栫爜锛堝叧鑱� YW_CUSTOMER )锛�", example = "1")
+ private Integer customerId;
+
@ApiModelProperty(value = "韬唤璇佸彿锛圡D4鍔犲瘑锛�")
private String idcardNo;
@ApiModelProperty(value = "淇敼鐨勮韩浠借瘉鍙� ")
@@ -169,8 +176,6 @@
private String hkId;
-
-
@ApiModelProperty(value = "娴峰悍鏈�杩戝悓姝ユ椂闂�")
private Date hkDate;
@@ -199,10 +204,6 @@
@ApiModelProperty(value = "鐧婚檰瀵嗙爜")
private String passward;
-
- @ApiModelProperty(value = "鏄惁楂樼骇瀹℃壒浜� 0鍚� 1鏄�", example = "1")
- private Integer highCheckor;
-
@ApiModelProperty(value = "闂ㄧ瑙掕壊缂栫爜锛堝叧鑱攄evice_role),澶氫釜鑻辨枃閫楀彿闅斿紑", example = "1")
private String roleId;
@@ -215,6 +216,11 @@
@ApiModelProperty(value = "璁垮鍏徃鍚嶇О")
private String visitCompanyName;
+ @ApiModelProperty(value = "閭")
+ @ExcelColumn(name="閭")
+ private String email;
+
+
@ApiModelProperty(value = "鏈�鍚庢搷浣滀汉")
@TableField(exist = false)
--
Gitblit v1.9.3