From c0a77acc892d89bf7dd4a04a19d85ba71c0dd57c Mon Sep 17 00:00:00 2001 From: rx <auster_i@163.com> Date: 星期一, 26 八月 2024 16:12:08 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master-rx-卡项促销活动分类' into master-jiayan-test --- phis-feign/src/main/java/com/hz/his/dto/user/UserUnionDto.java | 2 +- 1 files changed, 1 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 fb04d0d..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; -- Gitblit v1.8.0