From 6436fd1c4ba085e6aea2254071a324269b113ba9 Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期四, 03 八月 2023 18:30:34 +0800
Subject: [PATCH] Merge branch 'fhx-prod-用户建档' into master-prod-new

---
 phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java |   14 ++++++++++++--
 1 files changed, 12 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..a8b6967 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
@@ -43,6 +43,16 @@
     /**闈炲繀濉� 浼樻儬鍒竔d闆嗗悎*/
     private List<String> userCouponIds;
 
-    /**ocr 澶т紬鐐硅瘎鍥剧墖鍦板潃*/
-    private String ocrImageUrl;
+    /**ocr澶т紬鐐硅瘎璁㈠崟鍥剧墖鍦板潃*/
+    private String orderOCRImageUrl;
+
+    /**绗笁鏂硅鍗曠紪鍙�*/
+    private String otherOrderNo;
+    /**绗笁鏂瑰厬鎹㈢爜*/
+    private String redemptionCode;
+
+    /**缁撹处涔嬪悗鏄惁鐩存帴鍒掓墸锛�0鍚�1鏄�*/
+    private Integer directDeduction = 0;
+    /**鍗℃墸涓嶅垽鏂繃鏈熸椂闂达細0鍚�1鏄�*/
+    private Integer cardPass = 0;
 }

--
Gitblit v1.8.0