From 3bbfd6d4e0f3407c54fdbbe02b0f5ea298b582da Mon Sep 17 00:00:00 2001
From: ANDRU-PC\Andru <769883346@qq.com>
Date: 星期二, 04 七月 2023 10:46:56 +0800
Subject: [PATCH] Merge branch 'master' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 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 cf65bc1..bdb7374 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
@@ -42,7 +42,14 @@
     private Integer couponCheckVersion = 0;
     /**闈炲繀濉� 浼樻儬鍒竔d闆嗗悎*/
     private List<String> userCouponIds;
+    
+    /**ocr澶т紬鐐硅瘎璁㈠崟鍥剧墖鍦板潃*/
+    private String orderOCRImageUrl;
 
-    /**ocr 澶т紬鐐硅瘎鍥剧墖鍦板潃*/
-    private String ocrImageUrl;
+    /**绗笁鏂硅鍗曠紪鍙�*/
+    private String otherOrderNo;
+    /**绗笁鏂瑰厬鎹㈢爜*/
+    private String redemptionCode;
+    /**缁撹处涔嬪悗鏄惁鐩存帴鍒掓墸锛�0鍚�1鏄�*/
+    private Integer directDeduction;
 }

--
Gitblit v1.8.0