From 67926388d2b3b96f6360af6d70fdc56596b6b39d Mon Sep 17 00:00:00 2001 From: fwq <582742538@qq.com> Date: 星期日, 28 四月 2024 16:31:11 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master-fwq-积分抵扣现金' into master-fwq-积分抵扣现金 --- 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