From c4d73aa5200c7da5aec927096c8290f968ad19b3 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期一, 20 五月 2024 16:19:21 +0800
Subject: [PATCH] Merge branch 'master-prod-new' of http://1.15.4.62/r/~chenjiahe/phis-service-feign into master-prod-new
---
phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPHisDto.java | 4 ++++
1 files changed, 4 insertions(+), 0 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 9ed4794..cef0e81 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
@@ -24,6 +24,8 @@
private BigDecimal totalPoints;
/**闈炲繀濉� 鎶樻墸(鍗曚綅:鐧惧垎姣�) 蹇呭～锛岄粯璁�100,涓嶄紶鍚庡彴榛樿100*/
private BigDecimal discount;
+ /**褰撳墠鏄惁鍏佽浣庡垎鎶垫墸鐜伴噾*/
+ private Boolean isCanUseIntegralCash = false;
/**鎶垫墸鐜伴噾閲戦*/
private BigDecimal cash = BigDecimal.ZERO;
/**鎶垫墸鐜伴噾閲戦闇�瑕佹敮浠樼殑绉垎*/
@@ -35,6 +37,8 @@
/**闈炲繀濉� 绗笁鏂筰tem鏍囪瘑 */
private String commonItemId;
+ /**闈炲繀濉� 绗笁鏂筰tem鐨剆pu鏍囪瘑 */
+ private String commonItemGoodsId;
/**闈炲繀濉� 韬綋閮ㄤ綅鏍囪瘑 */
private String bodyPartsId;
/**闈炲繀濉� 韬綋閮ㄤ綅鍚嶇О */
--
Gitblit v1.8.0