From d621324bcf6c5a26f058b24e0f4d2930f41840f4 Mon Sep 17 00:00:00 2001
From: rx <auster_i@163.com>
Date: 星期一, 05 八月 2024 18:45:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-base' into master-prod-new
---
phis-feign/src/main/java/com/hz/his/dto/order/CreateOrderReturnDto.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/CreateOrderReturnDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/CreateOrderReturnDto.java
index f5c42a2..658c547 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/CreateOrderReturnDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/CreateOrderReturnDto.java
@@ -17,8 +17,14 @@
private String orderId;
/**璁㈠崟鍙�*/
private String orderNo;
+ /**鎶樻墸浼樻儬閲戦*/
+ private BigDecimal discountTotal = BigDecimal.ZERO;
+ /**瀹℃牳鐘舵��*/
+ private Integer applyStatus = -1;
/**瀛愬崟淇℃伅*/
private List<CreateOrderReturnItemDto> itemDtoList;
+ /**瀛愬崟*/
+ private List<CreateOrderReturnItemDto> orderItemList;
}
--
Gitblit v1.8.0