From 93e2629252f8ccaf94fe571a1496acfb3087a058 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 03 四月 2023 19:02:16 +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 |    2 ++
 1 files changed, 2 insertions(+), 0 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..aaf032b 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
@@ -19,6 +19,8 @@
     private String tel;
     /**鎵�灞為棬搴楁爣璇�*/
     private String shopId;
+    /**鎵�灞為【闂爣璇�*/
+    private String hisCorpUserId;
     /**鎵�灞為【闂悕绉�*/
     private String beCorpUser;
     /**鏄惁鏌ヨ鎵�灞為【闂俊鎭�:0鍚�1鏄�*/

--
Gitblit v1.8.0