From e6760711ae80d54481d1cb7321e10a3c6f2cb795 Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期一, 06 十一月 2023 11:25:50 +0800
Subject: [PATCH] Merge branch 'master' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/order/OrderItemSourceRefundDto.java |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemSourceRefundDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemSourceRefundDto.java
index bb27487..db2ccce 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemSourceRefundDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemSourceRefundDto.java
@@ -1,8 +1,10 @@
 package com.hz.his.dto.order;
 
+import com.hz.his.vo.order.refund.RefundDeductionCancelVo;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 /**
  * @Author
@@ -26,8 +28,10 @@
     /** 閫�娆惧師鍥狅紙鐢ㄦ埛锛� */
     private String refundReason;
 
-    /////鐢ㄤ簬绯荤粺杩斿洖鍙傛暟璁$畻
-    /** 鍙��鎬婚噾棰�*/
+    /** 闇�瑕佷綔搴熺殑鍒掓墸璁板綍*/
+    private List<RefundDeductionCancelVo> refundDeductionCancelList;
+
+    /** 鍙��鎬婚噾棰濓紙鐢ㄤ簬绯荤粺杩斿洖鍙傛暟璁$畻锛�*/
     private BigDecimal approveRefundTotal = BigDecimal.ZERO;
 
 }

--
Gitblit v1.8.0