From c744b64955f5724a2112dcf8bcd7498626037fe9 Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期四, 02 十一月 2023 10:55:59 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/order/OrderItemRefundDto.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemRefundDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemRefundDto.java
index d1ffe6b..8c63637 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemRefundDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemRefundDto.java
@@ -1,5 +1,6 @@
package com.hz.his.dto.order;
+import com.hz.his.vo.order.refund.RefundDeductionCancelVo;
import lombok.Data;
import java.math.BigDecimal;
@@ -27,11 +28,13 @@
/** 閫�娆惧師鍥狅紙鐢ㄦ埛锛� */
private String refundReason;
- /////鐢ㄤ簬绯荤粺杩斿洖鍙傛暟璁＄畻
- /** 鍙��鎬婚噾棰�*/
- private BigDecimal approveRefundTotal = BigDecimal.ZERO;
-
/** 閫�娆句簩绾у瓙璁㈠崟淇℃伅闆嗗悎 */
private List<OrderItemSourceRefundDto> orderItemSourceRefundDtos;
+ /** 闇�瑕佷綔搴熺殑鍒掓墸璁板綍*/
+ private List<RefundDeductionCancelVo> refundDeductionCancelList;
+
+
+ /** 鍙��鎬婚噾棰濓紙鐢ㄤ簬绯荤粺杩斿洖鍙傛暟璁＄畻锛�*/
+ private BigDecimal approveRefundTotal = BigDecimal.ZERO;
}
--
Gitblit v1.8.0