From 82f1a126d6fb6b5ceda341d8f46f8125f45cfaf7 Mon Sep 17 00:00:00 2001
From: ANDRU-PC\Andru <769883346@qq.com>
Date: 星期四, 04 五月 2023 11:50:46 +0800
Subject: [PATCH] Merge branch 'master' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/order/OrderItemRefundDto.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 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 6dcb6bb..d1ffe6b 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
@@ -18,15 +18,19 @@
private String type;
/** 鍟嗗搧鍚嶇О */
private String goodsName;
- /** 瀹為��鏁� */
+ /** 瀹為��鏁帮紙瀹㈡埛濉啓锛� */
private Integer refundNum;
- /** 瀹為��閲戦 */
+ /** 瀹為��閲戦 锛堝鎴峰～鍐欙級*/
private BigDecimal refundMoney;
/** 閫�娆惧師鍥狅紙鍛樺伐锛� */
private String remarks;
/** 閫�娆惧師鍥狅紙鐢ㄦ埛锛� */
private String refundReason;
+ /////鐢ㄤ簬绯荤粺杩斿洖鍙傛暟璁＄畻
+ /** 鍙��鎬婚噾棰�*/
+ private BigDecimal approveRefundTotal = BigDecimal.ZERO;
+
/** 閫�娆句簩绾у瓙璁㈠崟淇℃伅闆嗗悎 */
private List<OrderItemSourceRefundDto> orderItemSourceRefundDtos;
--
Gitblit v1.8.0