From ef212c321c6d833d69091e7491521f7d11984bfb Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 30 十月 2023 15:46:06 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-fwq抽奖配置

---
 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