From ec36eca8c8e09045f4879d69926712ecd16d4bc3 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 04 十二月 2023 17:04:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java | 28 ++++++++++++++++++++++++----
1 files changed, 24 insertions(+), 4 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 47773d3..acb77ee 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
@@ -13,7 +13,7 @@
/**
* 浜哄憳淇℃伅琛�
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
@Data
@ApiModel("浜哄憳淇℃伅琛�")
@@ -58,7 +58,18 @@
@ApiModelProperty(value = "浜鸿劯鐓х墖")
@ExcelColumn(name="浜鸿劯鐓х墖")
private String faceImg;
-
+ @ApiModelProperty(value = "浜鸿劯瀛樺偍鏈嶅姟鍣ㄦ爣璇嗭紙娴峰悍锛�")
+ @ExcelColumn(name="浜鸿劯瀛樺偍鏈嶅姟鍣ㄦ爣璇嗭紙娴峰悍锛�")
+ private String faceServeIndexCode;
+ @ApiModelProperty(value = "浜鸿劯缂栫爜锛堟捣搴凤級")
+ @ExcelColumn(name="浜鸿劯缂栫爜锛堟捣搴凤級")
+ private String faceId;
+ @ApiModelProperty(value = "浜鸿劯鍚屾鐘舵�侊紙娴峰悍锛� 0鏈悓姝� 1宸插悓姝� 2鍚屾澶辫触")
+ @ExcelColumn(name="浜鸿劯鍚屾鐘舵�侊紙娴峰悍锛� 0鏈悓姝� 1宸插悓姝� 2鍚屾澶辫触")
+ private Integer faceStatus;
+ @ApiModelProperty(value = "浜鸿劯鍚屾淇℃伅锛堟捣搴凤級")
+ @ExcelColumn(name="浜鸿劯鍚屾淇℃伅锛堟捣搴凤級")
+ private String faceInfo;
@ApiModelProperty(value = "鍋ュ悍鐮�")
@ExcelColumn(name="鍋ュ悍鐮�")
private String imgurl;
@@ -125,8 +136,8 @@
@ExcelColumn(name="娴峰悍鏍囪瘑")
private Integer hkId;
- @ApiModelProperty(value = "娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�", example = "1")
- @ExcelColumn(name="娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�")
+ @ApiModelProperty(value = "娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝� 2鍚屾澶辫触 ", example = "1")
+ @ExcelColumn(name="娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝� 2鍚屾澶辫触")
private Integer hkStatus;
@ApiModelProperty(value = "娴峰悍鏈�杩戝悓姝ユ椂闂�")
@@ -176,4 +187,13 @@
@ExcelColumn(name="闂ㄧ瑙掕壊缂栫爜锛堝叧鑱攄oor_role)")
private Integer roleId;
+ @ApiModelProperty(value = "闂ㄧ瑙掕壊鎺堟潈鏃堕棿")
+ @ExcelColumn(name="闂ㄧ瑙掕壊鎺堟潈鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date roleDate;
+
+ @ApiModelProperty(value = "ERP缁勭粐缂栫爜")
+ @ExcelColumn(name="ERP缁勭粐缂栫爜")
+ private String erpOrgId;
+
}
--
Gitblit v1.9.3