From 4a65361237916166b256934e6ea35932bba7e1c6 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期二, 11 七月 2023 11:26:54 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java | 7 +++++--
1 files changed, 5 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 65fa209..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
@@ -42,7 +42,7 @@
private Integer couponCheckVersion = 0;
/**闈炲繀濉� 浼樻儬鍒竔d闆嗗悎*/
private List<String> userCouponIds;
-
+
/**ocr澶т紬鐐硅瘎璁㈠崟鍥剧墖鍦板潃*/
private String orderOCRImageUrl;
@@ -50,6 +50,9 @@
private String otherOrderNo;
/**绗笁鏂瑰厬鎹㈢爜*/
private String redemptionCode;
+
/**缁撹处涔嬪悗鏄惁鐩存帴鍒掓墸锛�0鍚�1鏄�*/
- private Integer directDeduction;
+ private Integer directDeduction = 0;
+ /**鍗℃墸涓嶅垽鏂繃鏈熸椂闂达細0鍚�1鏄�*/
+ private Integer cardPass = 0;
}
--
Gitblit v1.8.0