From e192c9e13596244cbd4e7912331c19bcc92f2e6c Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期一, 18 十二月 2023 14:56:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new
---
phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java
index fa7b371..0973a06 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java
@@ -23,6 +23,8 @@
private String tel;
/**鎵�灞為棬搴楁爣璇�*/
private String shopId;
+ /**鍙傛暟*/
+ private String state;
/**鎵�灞為【闂爣璇�*/
private String hisCorpUserId;
/**鎵�灞為【闂悕绉�*/
@@ -43,7 +45,9 @@
private Date startTime;
/**缁撴潫鏃堕棿*/
private Date endTime;
- //鏄惁璇勪环
+ /**鏄惁璇勪环*/
private Integer isEvaluate;
+ /**浼氬憳绫诲瀷*/
+ private Integer memberType;
}
--
Gitblit v1.8.0