From 6cc93c8679746eb9a9c6e53875336e8322aa34cb Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 05 九月 2022 15:46:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master-test

---
 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 e69c4b6..e53423d 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
@@ -16,6 +16,10 @@
 public class OrderItemPHisDto {
     /**蹇呭~ 鍟嗗搧绫诲瀷(OrderItemConstants) crm濉粯璁roject,鍏呭�煎氨濉玶echarge,绾晢鍝佽鍗曞~retail闆跺敭, */
     private String type;
+    /**蹇呭~ 瀛愬崟鎬讳环锛屽疄浠樹环鏍硷紙鍏冿級*/
+    private BigDecimal total;
+    /**蹇呭~ 瀛愬崟鎬荤Н鍒嗭紝瀹炰粯绉垎*/
+    private BigDecimal totalIntegral;
     /**蹇呭~ 鎶樻墸(鍗曚綅:鐧惧垎姣�) 蹇呭~锛岄粯璁�100*/
     private BigDecimal discount;
     /**蹇呭~ 璐拱鏁伴噺 蹇呭~锛岄粯璁�0*/

--
Gitblit v1.8.0