From 15db6604ad718ebaf36c9077158651127b5f52b1 Mon Sep 17 00:00:00 2001 From: fwq <582742538@qq.com> Date: 星期二, 22 八月 2023 11:53:13 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new --- phis-feign/src/main/java/com/hz/his/vo/order/refund/RefundDeductionCancelVo.java | 9 +++++++++ phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java | 2 ++ 2 files changed, 11 insertions(+), 0 deletions(-) diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java index e05dee0..d956e15 100644 --- a/phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java +++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java @@ -26,6 +26,8 @@ private String remarks; /** 閫�娆惧師鍥狅紙鐢ㄦ埛锛� */ private String refundReason; + /** Y-鑷姩浣滃簾鍒掓墸 0鍚�1鏄紙鏁村崟閫�鐨勬椂鍊欑敤鍒帮級*/ + private Integer deductionCancel = 0; /** 鎿嶄綔浜哄憳宸ユ爣璇�*/ private String operatorId; diff --git a/phis-feign/src/main/java/com/hz/his/vo/order/refund/RefundDeductionCancelVo.java b/phis-feign/src/main/java/com/hz/his/vo/order/refund/RefundDeductionCancelVo.java index 387815e..82d7797 100644 --- a/phis-feign/src/main/java/com/hz/his/vo/order/refund/RefundDeductionCancelVo.java +++ b/phis-feign/src/main/java/com/hz/his/vo/order/refund/RefundDeductionCancelVo.java @@ -2,6 +2,8 @@ import lombok.Data; +import java.math.BigDecimal; + /** * 閫�娆�-浣滃簾鍒掓墸 * @author CJH @@ -9,11 +11,18 @@ @Data public class RefundDeductionCancelVo { + /**Y-鍒掓墸璁板綍缂栧彿*/ + private String deductionNo; /**Y-鍒掓墸椤圭洰璁板綍鏍囪瘑*/ private String deductionProjectId; /**Y-鍒掓墸鎬昏褰曟爣璇�*/ private String deductionSingleId; + /**鎵�灞炵敤鎴烽」鐩�*/ + private String userProjectItemId; + /**鍒掓墸閲戦锛堢郴缁熶紶鍊间娇鐢級*/ + private BigDecimal deductionAmount; /**鍒掓墸鏁伴噺锛堢郴缁熶紶鍊间娇鐢級*/ private Integer num; + } -- Gitblit v1.8.0