From ed43bd0e7f5520f227c329ef436adb1e278016a7 Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期三, 11 十月 2023 11:56:15 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/order/OrderItemSourceRefundDto.java |    9 +++++++++
 1 files changed, 9 insertions(+), 0 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 6180767..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
@@ -25,4 +27,11 @@
     private String remarks;
     /** 閫�娆惧師鍥狅紙鐢ㄦ埛锛� */
     private String refundReason;
+
+    /** 闇�瑕佷綔搴熺殑鍒掓墸璁板綍*/
+    private List<RefundDeductionCancelVo> refundDeductionCancelList;
+
+    /** 鍙��鎬婚噾棰濓紙鐢ㄤ簬绯荤粺杩斿洖鍙傛暟璁$畻锛�*/
+    private BigDecimal approveRefundTotal = BigDecimal.ZERO;
+
 }

--
Gitblit v1.8.0