From a6eab70d0158d0d598225c0fec4ff96b27e84856 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期二, 22 八月 2023 10:14:51 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 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 bf79ec1..543ace4 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,4 +45,14 @@
     
     /**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