From ad6dfb8323ab40ca8fe4fed94722c755d89c3203 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 28 二月 2024 15:14:47 +0800
Subject: [PATCH] 整理
---
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java
index 310ffed..ce884ad 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java
@@ -79,7 +79,7 @@
@ExcelColumn(name="绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴浜哄憳")
private Integer type;
- @ApiModelProperty(value = "璁垮鍚嶇О")
+ @ApiModelProperty(value = "璁垮鍚嶇О/鍐呴儴浜哄憳")
@ExcelColumn(name="璁垮鍚嶇О")
private String name;
@@ -141,8 +141,8 @@
@ExcelColumn(name="娴峰悍鏍囪瘑")
private String hkId;
- @ApiModelProperty(value = "娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝� 2鍚屾澶辫触 ", example = "1")
- @ExcelColumn(name="娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝� 2鍚屾澶辫触")
+ @ApiModelProperty(value = "娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝� 2鍚屾澶辫触 3涓嶇鍚堜笅鍙戞潯浠� ", example = "1")
+ @ExcelColumn(name="娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝� 2鍚屾澶辫触 3涓嶇鍚堜笅鍙戞潯浠�")
private Integer hkStatus;
@ApiModelProperty(value = "娴峰悍鏈�杩戝悓姝ユ椂闂�")
@@ -201,15 +201,23 @@
@ExcelColumn(name="ERP缁勭粐缂栫爜")
private String erpOrgId;
+ @ApiModelProperty(value = "璁垮鍏徃鍚嶇О")
+ @ExcelColumn(name="璁垮鍏徃鍚嶇О")
+ private String visitCompanyName;
+
@ApiModelProperty(value = "缁勭粐鍚嶇О")
@TableField(exist = false)
private String companyName;
@ApiModelProperty(value = "缁勭粐娴峰悍缂栫爜")
@TableField(exist = false)
- private String companyHkId;
+ private String hkOrgId;
@ApiModelProperty(value = "瑙掕壊缂栫爜鏌ヨ")
@TableField(exist = false)
private String roleIdParam;
+
+ @ApiModelProperty(value = "鎺堟潈闂ㄧ缁勭紪鐮侀泦鍚�,銆愯瀹㈢銆戝敮涓�鏍囪瘑",hidden = true )
+ @TableField(exist = false)
+ private Integer[] roleIds;
//鏆傛棤浣跨敤
@ApiModelProperty(value = "濮撳悕/鎵嬫満鍙�/宸ュ彿")
@@ -225,9 +233,15 @@
private Integer visitTimes;
@ApiModelProperty(value = "鏈�鍚庤闂椂闂�")
- @TableField(exist = false)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date lastVisitDate;
+ @ApiModelProperty(value = "闂ㄧ鏈夋晥鏈熷紑濮�")
+ @ExcelColumn(name="闂ㄧ鏈夋晥鏈熷紑濮�",index= 5,dateFormat = "yyyy-MM-dd")
+ private Date startTime;
+
+ @ApiModelProperty(value = "闂ㄧ鏈夋晥鏈熺粨鏉�", example = "1")
+ @ExcelColumn(name="闂ㄧ鏈夋晥鏈熺粨鏉�",index= 6,dateFormat = "yyyy-MM-dd")
+ private Date endTime;
}
--
Gitblit v1.9.3