From 155905061b3aa29d2aa23e5693e8704debfb9828 Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期一, 06 十一月 2023 16:36:06 +0800
Subject: [PATCH] Merge branch 'master' into master-test
---
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