From a1acacfb8cfa4b0e2fc07fbf214f4f9b47636c98 Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期五, 15 三月 2024 18:44:10 +0800
Subject: [PATCH] Merge branch 'fhx-prod-FDD' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java
index 004e530..5863f34 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java
@@ -45,7 +45,7 @@
     private Integer couponCheckVersion = 0;
     /**闈炲繀濉� 浼樻儬鍒竔d闆嗗悎*/
     private List<String> userCouponIds;
-
+    
     /**ocr澶т紬鐐硅瘎璁㈠崟鍥剧墖鍦板潃*/
     private String orderOCRImageUrl;
 
@@ -65,8 +65,9 @@
     private BigDecimal giveIncrease;
     /**璧犻�佸鍊奸噾鍒拌处瑙勫垯锛圡oneyRule锛夛紙浼犱簡灏变娇鐢紝鍚﹀垯灏遍粯璁わ級*/
     private String giveIncreaseId;
-    /**璧犻�佹爣棰橈紙棰嗗彇璁板綍灞曠ず锛�*/
+    /**璧犻�佹爣棰橈紙棰嗗彇璁板綍灞曠ず-鏍囬锛�*/
     private String giveIncreaseTitle;
-
+    /**璧犻�佹爣棰橈紙棰嗗彇璁板綍灞曠ず-璇︽儏锛�*/
+    private String giveIncreaseInfo;
 
 }

--
Gitblit v1.8.0