From a254510ced8108c0cde37eb31a6b3e6469fcb2fb Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 04 三月 2024 13:51:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/dmvisit_service/src/main/java/com/doumee/dao/business/model/MemberRole.java |   11 -----------
 1 files changed, 0 insertions(+), 11 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 1559ca8..230a9bb 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
@@ -59,16 +59,5 @@
     @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