From a6eab70d0158d0d598225c0fec4ff96b27e84856 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期二, 22 八月 2023 10:14:51 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
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, 10 insertions(+), 1 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..f90adf0 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,16 @@
@Data
public class RefundDeductionCancelVo {
- /**Y-鍒掓墸椤圭洰璁板綍鏍囪瘑*/
+ /**Y-鍒掓墸椤圭洰璁板綍鏍囪瘑锛堟殏鏃剁敤涓嶄笂锛�*/
private String deductionProjectId;
/**Y-鍒掓墸鎬昏褰曟爣璇�*/
private String deductionSingleId;
+ /**鎵�灞炵敤鎴烽」鐩�*/
+ private String userProjectItemId;
+ /**鍒掓墸閲戦锛堢郴缁熶紶鍊间娇鐢級*/
+ private BigDecimal deductionAmount;
/**鍒掓墸鏁伴噺锛堢郴缁熶紶鍊间娇鐢級*/
private Integer num;
+
}
--
Gitblit v1.8.0