From 9d155e045fbf7b1c50b2d44873f84e7be5b2333d Mon Sep 17 00:00:00 2001 From: fwq <582742538@qq.com> Date: 星期二, 04 七月 2023 16:24:39 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new --- 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 65fa209..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 @@ -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