From ec23eaeb3e4e961012615cef296b89b2535673a5 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 05 二月 2024 17:42:46 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test

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

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 8c8bd0c..836ce0b 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,13 @@
  */
 @Data
 public class MarketingResultDto {
-    /**钀ラ攢鍔╂墜椤圭洰鐨勬爣璇�*/
+    /**钀ラ攢鍔╂墜鍞竴鏍囪瘑*/
     private String applyId;
-    /**瀹℃牳鏍囪瘑*/
-    private String examineId;
+    /**鍞竴鏍囪瘑*/
+    private String uniqueId;
     /**鏄惁鐩存帴閫氳繃:0鍚�1鏄�,濡傛灉鏄洿鎺ラ�氳繃鍒欎笉鍐嶅洖璋僊arketingReturnDto*/
     private Integer isPass;
+    /**瀹℃牳鏍囪瘑*/
+    private String examineId;
+
 }

--
Gitblit v1.8.0