From 3b48383729e46bbd4ab0a2867df497489acb4338 Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期二, 15 八月 2023 15:10:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-test' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPHisDto.java | 5 +++++
1 files changed, 5 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 caca455..ae6779a 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
@@ -20,6 +20,8 @@
private BigDecimal total;
/**蹇呭～ 瀛愬崟鎬荤Н鍒嗭紝瀹炰粯绉垎(鏆傛椂鐢ㄤ笉涓�)*/
private BigDecimal totalIntegral;
+ /**闈炲繀濉� 瀛愬崟鎬荤Н鍒嗭紝寮�鍗曟椂搴斾粯鎬荤Н鍒�(CRM绉垎璁㈠崟鏃跺繀濉�)*/
+ private BigDecimal totalPoints;
/**闈炲繀濉� 鎶樻墸(鍗曚綅:鐧惧垎姣�) 蹇呭～锛岄粯璁�100,涓嶄紶鍚庡彴榛樿100*/
private BigDecimal discount;
/**蹇呭～ 璐拱鏁伴噺 蹇呭～锛岄粯璁�0*/
@@ -45,4 +47,7 @@
/**闈炲繀濉� 鍗″寘鏍囪瘑 */
private List<CardItemInfoDto> cardItemInfoIds;
+ /** 璇夋眰鍒嗙被idList */
+ private List<String> appealTypeIdList;
+
}
--
Gitblit v1.8.0