From 0bfe0ee18e302123944a2a33ba5760a8a3da25f7 Mon Sep 17 00:00:00 2001 From: zhangxu <3%usVi4iXbVkhI1c> Date: 星期二, 13 十二月 2022 15:26:10 +0800 Subject: [PATCH] Merge branch 'master-zhangxu' 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