From fcfc7c0510592aade38d4ef84070e0445964334c Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期一, 01 四月 2024 18:57:06 +0800
Subject: [PATCH] Merge branch 'fhx-prod-FDD' into master-prod-new

---
 phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarCommonReturnDto.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarCommonReturnDto.java b/phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarCommonReturnDto.java
index b7a39d8..94d88f7 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarCommonReturnDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarCommonReturnDto.java
@@ -15,7 +15,7 @@
     private String time;
     /**sign*/
     private String sign;
-    /**杩斿洖鏁版嵁  鍙弬鑰僊arketingReturnDto*/
+    /**杩斿洖鏁版嵁  鍙弬鑰僊arketingResultDto 鍜� MarketingReturnDto*/
     private String data;
 
 

--
Gitblit v1.8.0