From 5c5e492f52d0afc8aad87d595c3b7ce83c979348 Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期三, 21 六月 2023 14:26:15 +0800
Subject: [PATCH] Merge branch 'master-prod-new'

---
 phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java |   21 ++++++++++++++++++++-
 1 files changed, 20 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..325f280 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
@@ -1,5 +1,7 @@
 package com.hz.his.dto.user;
 
+import com.gitee.sunchenbin.mybatis.actable.annotation.Column;
+import com.gitee.sunchenbin.mybatis.actable.constants.MySqlTypeConstant;
 import com.hz.his.dto.PageDto;
 import lombok.Data;
 
@@ -7,17 +9,34 @@
 /**鏌ヨ鐢ㄦ埛璇︽儏鏁版嵁*/
 @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;
+    /*寮�鍗曞钩鍙帮紝鏉ユ簮搴旂敤appId*/
+    private String appId;
 }

--
Gitblit v1.8.0