From 7b2467a59d3a663fc3d004c852a843f363251029 Mon Sep 17 00:00:00 2001
From: rx <auster_i@163.com>
Date: 星期五, 02 八月 2024 17:22:02 +0800
Subject: [PATCH] Merge branch 'master-0729-功能优化' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPHisDto.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPHisDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPHisDto.java
index 3372d50..389c14b 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPHisDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPHisDto.java
@@ -26,12 +26,12 @@
private Integer discountAlgorithm = DISCOUNT_ALGORITHM_PRICE;
/**闈炲繀濉� 鎶樻墸(鍗曚綅:鐧惧垎姣�) 蹇呭～锛岄粯璁�100,涓嶄紶鍚庡彴榛樿100*/
private BigDecimal discount;
- /**褰撳墠鏄惁鍏佽浣庡垎鎶垫墸鐜伴噾*/
- private Boolean isCanUseIntegralCash = false;
/** 浼樻儬鍒搁噾棰濓紙鍏冿級蹇呭～锛屼笉浼犲垯榛樿0 */
private BigDecimal couponTotal;
/** 浼樻儬绂忓埄鎬婚噾棰濓紙鍏冿級蹇呭～锛屼笉浼犲垯榛樿0 */
private BigDecimal preferentialTotal;
+ /**褰撳墠鏄惁鍏佽浣庡垎鎶垫墸鐜伴噾*/
+ private Boolean isCanUseIntegralCash = false;
/**鎶垫墸鐜伴噾閲戦*/
private BigDecimal cash = BigDecimal.ZERO;
/**鎶垫墸鐜伴噾閲戦闇�瑕佹敮浠樼殑绉垎*/
--
Gitblit v1.8.0