From e7d554f4f8f79eafaa2de3abe036d21e300fd14a Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期五, 23 二月 2024 17:39:56 +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/OrderDiscountDto.java | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/marketing/OrderDiscountDto.java b/phis-feign/src/main/java/com/hz/his/dto/marketing/OrderDiscountDto.java
index 69014ae..96c37f0 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/marketing/OrderDiscountDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/marketing/OrderDiscountDto.java
@@ -1,5 +1,6 @@
package com.hz.his.dto.marketing;
+import com.hz.his.dto.order.OrdersTotalDto;
import lombok.Data;
import java.math.BigDecimal;
@@ -11,12 +12,8 @@
@Data
public class OrderDiscountDto extends MarketingDto{
/*******************蹇呭～椤�(娉ㄦ剰缁ф壙鐨勫叕鍏辩被MarketingDto)*************************/
- /**璁㈠崟鏍囪瘑*/
- private String orderId;
- /**璁㈠崟鍙�*/
- private String orderNo;
- /**鍘熻鍗曟�婚噾棰�*/
- private BigDecimal totalPrice;
+ /**璁㈠崟淇℃伅*/
+ private OrdersTotalDto ordersTotalDto;
/**璁㈠崟鎶樻墸(鍗曚綅:鐧惧垎姣�)*/
private BigDecimal discountNum;
--
Gitblit v1.8.0