From 1918bee03c0924732c60c8db14a37a70cf2e0acc Mon Sep 17 00:00:00 2001
From: ANDRU-PC\Andru <769883346@qq.com>
Date: 星期四, 27 四月 2023 10:28:56 +0800
Subject: [PATCH] Merge branch 'master' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/order/OrderItemSourceRefundDto.java |   13 +++++++++++--
 1 files changed, 11 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 fb71596..bb27487 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
@@ -12,13 +12,22 @@
 public class OrderItemSourceRefundDto {
 
     /** 瀛愯鍗昳d */
-    private String orderItemId;
+    private String orderItemSonId;
     /** 瀛愯鍗曠被鍨� */
     private String type;
+    /** 鍟嗗搧鍚嶇О */
+    private String goodsName;
     /** 瀹為��鏁� */
     private Integer refundNum;
     /** 瀹為��閲戦 */
     private BigDecimal refundMoney;
-    /** 瀹為��鍘熷洜 */
+    /** 閫�娆惧師鍥狅紙鍛樺伐锛� */
+    private String remarks;
+    /** 閫�娆惧師鍥狅紙鐢ㄦ埛锛� */
     private String refundReason;
+
+    /////鐢ㄤ簬绯荤粺杩斿洖鍙傛暟璁$畻
+    /** 鍙��鎬婚噾棰�*/
+    private BigDecimal approveRefundTotal = BigDecimal.ZERO;
+
 }

--
Gitblit v1.8.0