From 262d511f52c7530f6f3ddbf595264f9880b4df4f Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期二, 14 十一月 2023 16:26:53 +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/OrderCancelDto.java | 5 +++--
1 files changed, 3 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..64309a8 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,6 @@
@Data
public class OrderCancelDto extends MarketingDto{
/*******************蹇呭～椤�(娉ㄦ剰缁ф壙鐨勫叕鍏辩被MarketingDto)*************************/
- /**璁㈠崟鏍囪瘑*/
- private String orderId;
+ /**璁㈠崟淇℃伅*/
+ private OrdersTotalDto ordersTotalDto;
}
--
Gitblit v1.8.0