From 14fe56337998458322ee4cd6ec8f284490e69df9 Mon Sep 17 00:00:00 2001
From: rx <auster_i@163.com>
Date: 星期一, 20 十一月 2023 18:12:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-test' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarCommonReturnDto.java | 2 +-
phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingResultDto.java | 4 ++--
2 files changed, 3 insertions(+), 3 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;
diff --git a/phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingResultDto.java b/phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingResultDto.java
index 7df2a42..8c8bd0c 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingResultDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingResultDto.java
@@ -8,10 +8,10 @@
*/
@Data
public class MarketingResultDto {
- /**钀ラ攢鍔╂墜鍞竴鏍囪瘑*/
+ /**钀ラ攢鍔╂墜椤圭洰鐨勬爣璇�*/
private String applyId;
/**瀹℃牳鏍囪瘑*/
private String examineId;
- /**鏄惁鐩存帴閫氳繃:0鍚�1鏄�*/
+ /**鏄惁鐩存帴閫氳繃:0鍚�1鏄�,濡傛灉鏄洿鎺ラ�氳繃鍒欎笉鍐嶅洖璋僊arketingReturnDto*/
private Integer isPass;
}
--
Gitblit v1.8.0