From 611e8f7f1986e96980712a083d06b7cfe45f928c Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 16 十月 2024 11:03:58 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 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 d90363d..1cc108c 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
@@ -75,8 +75,8 @@
@ExcelColumn(name="鍋ュ悍鐮�")
private String imgurl;
- @ApiModelProperty(value = "绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴浜哄憳", example = "1")
- @ExcelColumn(name="绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴浜哄憳")
+ @ApiModelProperty(value = "绫诲瀷 0鍙告満浜哄憳 1鏅�氳瀹� 2鍐呴儴浜哄憳", example = "1")
+ @ExcelColumn(name="绫诲瀷 0鍙告満浜哄憳 1鏅�氳瀹� 2鍐呴儴浜哄憳")
private Integer type;
@ApiModelProperty(value = "璁垮鍚嶇О/鍐呴儴浜哄憳")
@@ -160,6 +160,12 @@
@ApiModelProperty(value = "鍦ㄨ亴鐘舵�� 0鍦ㄨ亴 1绂昏亴", example = "1")
@ExcelColumn(name="鍦ㄨ亴鐘舵�� 0鍦ㄨ亴 1绂昏亴")
private Integer workStatus;
+ @ApiModelProperty(value = "鏄惁鍏氬憳 0鍚� 1鏄�", example = "1")
+ @ExcelColumn(name="鏄惁鍏氬憳 0鍚� 1鏄�")
+ private Integer isDangyuan;
+ @ApiModelProperty(value = "宀椾綅缂栫爜锛屽叧鑱攑ositionbiao", example = "1")
+ @ExcelColumn(name="宀椾綅缂栫爜")
+ private Integer positionId;
@ApiModelProperty(value = "ERP鏍囪瘑", example = "1")
@ExcelColumn(name="ERP鏍囪瘑")
private String erpId;
@@ -167,6 +173,10 @@
@ApiModelProperty(value = "ERP鍚屾鏃堕棿")
@ExcelColumn(name="ERP鍚屾鏃堕棿")
private Date erpDate;
+ @ApiModelProperty(value = "鍏ヨ亴濡傛湡")
+ @ExcelColumn(name="鍏ヨ亴濡傛湡")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date jobDate;
@ApiModelProperty(value = "ERP鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�", example = "1")
@ExcelColumn(name="ERP鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�")
@@ -218,7 +228,7 @@
@ApiModelProperty(value = "鏈�鍚庢搷浣滀汉")
@TableField(exist = false)
private String editorName;
- @ApiModelProperty(value = "缁勭粐绫诲瀷")
+ @ApiModelProperty(value = "缁勭粐绫诲瀷 0鍔冲姟鍏徃 1鍐呴儴缁勭粐")
@TableField(exist = false)
private Integer companyType;
@ApiModelProperty(value = "缁勭粐缂栫爜璺緞")
@@ -279,6 +289,9 @@
@ApiModelProperty(value = "鏄惁涓荤 0鍚� 1鏄�", example = "1")
@TableField(exist = false)
private Integer headStatus;
+ @ApiModelProperty(value = "鎸佸崱鏁伴噺")
+ @TableField(exist = false)
+ private int memberCardCount;
@ApiModelProperty(value = "闂ㄧ瑙掕壊鍚嶇О")
@TableField(exist = false)
@@ -286,6 +299,9 @@
@ApiModelProperty(value = "鏈�鍚庢搷浣滃唴瀹�")
@TableField(exist = false)
private String optRemark;
+ @ApiModelProperty(value = "宀椾綅鍚嶇О")
+ @TableField(exist = false)
+ private String positionName;
@ApiModelProperty(value = "鍩硅寮�濮嬫椂闂�")
@TableField(exist = false)
private Date trainStartTime;
--
Gitblit v1.9.3