From 9df4d63554ecd16bcf606adf9719978e96b22968 Mon Sep 17 00:00:00 2001
From: rx <auster_i@163.com>
Date: 星期三, 15 十一月 2023 17:43:44 +0800
Subject: [PATCH] Merge branch 'rx-1109-营销优惠券优化' into master-prod-new

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