From 7bf9a808ea23b746b8d6c743e3560e3dd62b3b27 Mon Sep 17 00:00:00 2001 From: rx <auster_i@163.com> Date: 星期三, 15 十一月 2023 18:39:39 +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/UserUnionDto.java | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/UserUnionDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/UserUnionDto.java index 19468ca..03ab138 100644 --- a/phis-feign/src/main/java/com/hz/his/dto/user/UserUnionDto.java +++ b/phis-feign/src/main/java/com/hz/his/dto/user/UserUnionDto.java @@ -16,7 +16,7 @@ private String fromCode; /** - * 鏉ユ簮鍚嶇О + * 鏉ユ簮鍚嶇О/鏉ユ簮璺緞 */ private String fromName; @@ -45,4 +45,6 @@ */ private String corpUserId; + private String id; + } -- Gitblit v1.8.0