From fcbe29760373012bae67ef8d95b587158df72304 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期六, 06 五月 2023 16:02:41 +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 |   17 ++++++++++++++++-
 1 files changed, 16 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 8e69929..4dd2935 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
@@ -7,17 +7,32 @@
 /**鏌ヨ鐢ㄦ埛璇︽儏鏁版嵁*/
 @Data
 public class UserDto extends PageDto {
-
+    /**鏍囪瘑*/
     private String id;
+    /**鐢ㄦ埛鏍囪瘑*/
     private String userId;
     /**ciq*/
     private String CIQ;
+    /**浼氬憳鍙�*/
+    private String memberNO;
     /**鍚嶇О*/
     private String name;
     /**鎵嬫満鍙�*/
     private String tel;
     /**鎵�灞為棬搴楁爣璇�*/
     private String shopId;
+    /**鎵�灞為【闂爣璇�*/
+    private String hisCorpUserId;
     /**鎵�灞為【闂悕绉�*/
     private String beCorpUser;
+    /**鏄惁鏌ヨ鎵�灞為【闂俊鎭�:0鍚�1鏄�*/
+    private Integer isSelectCorp = 0;
+    /**鏄惁鏌ヨ鎵�灞為棬搴椾俊鎭�:0鍚�1鏄�*/
+    private Integer isSelectShop = 0;
+    /**鏄惁鏌ヨ鎺ㄨ崘浜轰俊鎭�:0鍚�1鏄�*/
+    private Integer isSelectInvitee = 0;
+    /**鏄惁鏈夐棬搴�*/
+    private Integer isHaveShop;
+    /**鏄惁鏈夐【闂�*/
+    private Integer isHaveCorp;
 }

--
Gitblit v1.8.0