From 541e9a5eb10f788f1f8067823fa6f71e1b52c31e Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 12 十二月 2022 14:57:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/marketing/OrderPartRefundDto.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/marketing/OrderPartRefundDto.java b/phis-feign/src/main/java/com/hz/his/dto/marketing/OrderPartRefundDto.java
index 7819749..0f6c7e5 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/marketing/OrderPartRefundDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/marketing/OrderPartRefundDto.java
@@ -3,6 +3,7 @@
import com.hz.his.dto.order.OrdersTotalDto;
import lombok.Data;
+import java.math.BigDecimal;
import java.util.List;
/**
@@ -14,9 +15,11 @@
/*******************蹇呭～椤�(娉ㄦ剰缁ф壙鐨勫叕鍏辩被MarketingDto)*************************/
/**璁㈠崟淇℃伅*/
private OrdersTotalDto ordersTotalDto;
- /**閫�娆炬敮浠樻柟寮�*/
+ /**鏈閫�娆剧敵璇锋�婚噾棰�*/
+ private BigDecimal refundTotal;
+ /**鏈閫�娆炬敮浠樻柟寮�*/
private List<PartRefundPayDto> partRefundPayDtoList;
- /**閫�娆鹃」鐩�*/
+ /**鏈閫�娆鹃」鐩�*/
private List<RefundProjectDto> refundProjectDtoList;
}
--
Gitblit v1.8.0