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/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