From 3b48383729e46bbd4ab0a2867df497489acb4338 Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期二, 15 八月 2023 15:10:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-test' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java | 6 +++++-
1 files changed, 5 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 1164640..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
@@ -48,7 +48,11 @@
/**绗笁鏂硅鍗曠紪鍙�*/
private String otherOrderNo;
-
/**绗笁鏂瑰厬鎹㈢爜*/
private String redemptionCode;
+
+ /**缁撹处涔嬪悗鏄惁鐩存帴鍒掓墸锛�0鍚�1鏄�*/
+ private Integer directDeduction = 0;
+ /**鍗℃墸涓嶅垽鏂繃鏈熸椂闂达細0鍚�1鏄�*/
+ private Integer cardPass = 0;
}
--
Gitblit v1.8.0