From 82f1a126d6fb6b5ceda341d8f46f8125f45cfaf7 Mon Sep 17 00:00:00 2001
From: ANDRU-PC\Andru <769883346@qq.com>
Date: 星期四, 04 五月 2023 11:50:46 +0800
Subject: [PATCH] Merge branch 'master' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 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 9e9e894..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
@@ -13,18 +13,24 @@
     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;
+    private Integer isSelectCorp = 0;
     /**鏄惁鏌ヨ鎵�灞為棬搴椾俊鎭�:0鍚�1鏄�*/
-    private Integer isSelectShop;
+    private Integer isSelectShop = 0;
+    /**鏄惁鏌ヨ鎺ㄨ崘浜轰俊鎭�:0鍚�1鏄�*/
+    private Integer isSelectInvitee = 0;
     /**鏄惁鏈夐棬搴�*/
     private Integer isHaveShop;
     /**鏄惁鏈夐【闂�*/

--
Gitblit v1.8.0