From dfe372a6c34dbaed2fb4870ab29c18c6983e2d78 Mon Sep 17 00:00:00 2001 From: wangrenhuang <wangren_huang@163.com> Date: 星期二, 18 四月 2023 18:27:50 +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 | 15 ++++++++++++++- 1 files changed, 14 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..ed54f6e 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,30 @@ /**鏌ヨ鐢ㄦ埛璇︽儏鏁版嵁*/ @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鍚�1鏄�*/ + private Integer isSelectShop; + /**鏄惁鏈夐棬搴�*/ + private Integer isHaveShop; + /**鏄惁鏈夐【闂�*/ + private Integer isHaveCorp; } -- Gitblit v1.8.0