From b3e5616f2f02092c86d9b2b3d2da58a221bec59f Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期五, 23 二月 2024 10:20:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new
---
phis-feign/src/main/java/com/hz/his/dto/marketing/OrderPartRefundDto.java | 2 ++
phis-feign/src/main/java/com/hz/his/dto/marketing/OrderCancelDto.java | 2 ++
2 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/marketing/OrderCancelDto.java b/phis-feign/src/main/java/com/hz/his/dto/marketing/OrderCancelDto.java
index 64309a8..7745f9f 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/marketing/OrderCancelDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/marketing/OrderCancelDto.java
@@ -12,4 +12,6 @@
/*******************蹇呭～椤�(娉ㄦ剰缁ф壙鐨勫叕鍏辩被MarketingDto)*************************/
/**璁㈠崟淇℃伅*/
private OrdersTotalDto ordersTotalDto;
+ /**閫�璐圭粺璁＄被鍨�(RefundRecord)*/
+ private String refundStatistics;
}
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 0f6c7e5..11ba021 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
@@ -17,6 +17,8 @@
private OrdersTotalDto ordersTotalDto;
/**鏈閫�娆剧敵璇锋�婚噾棰�*/
private BigDecimal refundTotal;
+ /**閫�璐圭粺璁＄被鍨�(RefundRecord)*/
+ private String refundStatistics;
/**鏈閫�娆炬敮浠樻柟寮�*/
private List<PartRefundPayDto> partRefundPayDtoList;
/**鏈閫�娆鹃」鐩�*/
--
Gitblit v1.8.0