From 95dd7d30c396ddc175a794db43216f995c067e5d Mon Sep 17 00:00:00 2001 From: Andru <769883346@qq.com> Date: 星期一, 20 十一月 2023 10:24:48 +0800 Subject: [PATCH] Merge branch 'master-prod-new' into master-test --- phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java | 12 ++++++++++++ 1 files changed, 12 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..ded4a22 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 @@ -24,6 +24,8 @@ private List<PayAmountDto> amount; /**蹇呭~ 鎿嶄綔浜烘爣璇�,crm濉敤鎴�*/ private String operatorId; + /** 鎿嶄綔浜鸿鑹�(鍗囧崟缁撹处蹇呭~锛岄��娆句娇鐢�) */ + private String opRoleId; /**鏀粯鐢ㄦ埛*/ private String payUserId; @@ -45,4 +47,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