From 9645ca1ea0ca880eff9bb0ba2138fad2b012f3e1 Mon Sep 17 00:00:00 2001
From: lishuai <260038442@qq.com>
Date: 星期一, 18 十二月 2023 17:30:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/MemberRole.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/MemberRole.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/MemberRole.java
index 4ad7b3e..7e9d836 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/MemberRole.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/MemberRole.java
@@ -13,7 +13,7 @@
/**
* 浜哄憳瑙掕壊鍏宠仈淇℃伅
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
@Data
@ApiModel("浜哄憳瑙掕壊鍏宠仈淇℃伅")
@@ -59,4 +59,16 @@
@ExcelColumn(name="瑙掕壊缂栫爜锛堝叧鑱攄oor_role)")
private String roleId;
+ @ApiModelProperty(value = "娴峰悍鏍囪瘑")
+ @ExcelColumn(name="娴峰悍鏍囪瘑")
+ private String hkId;
+
+ @ApiModelProperty(value = "娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�")
+ @ExcelColumn(name="娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�")
+ private Integer hkStatus;
+
+ @ApiModelProperty(value = "娴峰悍鏈�杩戝悓姝ユ椂闂�")
+ @ExcelColumn(name="娴峰悍鏈�杩戝悓姝ユ椂闂�")
+ private Date hkDate;
+
}
--
Gitblit v1.9.3