From 3de90089345a2bb8c18114885a8d7dcd58a432ce Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期日, 16 七月 2023 19:44:06 +0800
Subject: [PATCH] Merge branch 'master' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java | 5 ++++-
1 files changed, 4 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 bdb7374..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
@@ -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