From e3ed252d835f663bd3e9b922c1e0ef6fde78a4f0 Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期四, 06 六月 2024 16:14:50 +0800
Subject: [PATCH] Merge branch 'fhx-prod-智能导诊' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java |    4 +++-
 1 files changed, 3 insertions(+), 1 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 b17c67c..0135be3 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;
 
@@ -69,5 +69,7 @@
     private String giveIncreaseTitle;
     /**璧犻�佹爣棰橈紙棰嗗彇璁板綍灞曠ず-璇︽儏锛夛紙涓嶈浣跨敤锛屼細鍒犻櫎锛�*/
     private String giveIncreaseInfo;
+    /**闈炲繀濉� 鍙互鍙備笌绉垎鎶垫墸缁撹处鐨勫晢鍝佹爣璇�*/
+    private List<String> canIntegralCashIdList;
 
 }

--
Gitblit v1.8.0