From e74dade001072c3a0e93cd6d698df4df2262f5a3 Mon Sep 17 00:00:00 2001 From: chenjiahe <763432473@qq.com> Date: 星期四, 01 八月 2024 22:30:27 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master-base' into master-test --- phis-feign/src/main/java/com/hz/his/dto/marketing/OrderCancelDto.java | 7 +++++-- 1 files changed, 5 insertions(+), 2 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 96c12a3..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 @@ -1,5 +1,6 @@ package com.hz.his.dto.marketing; +import com.hz.his.dto.order.OrdersTotalDto; import lombok.Data; /** @@ -9,6 +10,8 @@ @Data public class OrderCancelDto extends MarketingDto{ /*******************蹇呭~椤�(娉ㄦ剰缁ф壙鐨勫叕鍏辩被MarketingDto)*************************/ - /**璁㈠崟鏍囪瘑*/ - private String orderId; + /**璁㈠崟淇℃伅*/ + private OrdersTotalDto ordersTotalDto; + /**閫�璐圭粺璁$被鍨�(RefundRecord)*/ + private String refundStatistics; } -- Gitblit v1.8.0