From 8b72bd6ea00340d0f0c22b2f6f3ed315c74a2203 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期二, 08 十一月 2022 15:02:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/order/OrdersTotalDto.java |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrdersTotalDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrdersTotalDto.java
index e89eb6f..518d20f 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrdersTotalDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrdersTotalDto.java
@@ -169,6 +169,9 @@
     /** 搴峰崥浣虫爣璇�(KoapOrderTotal) */
     private String koapOrderId;
 
+    /**璁㈠崟鎬婚噾棰濈殑鎶樺悗閲戦*/
+    private BigDecimal disTotal;
+
     private OrderInfoDto orderInfo;
 
     private List<String> activityIds;

--
Gitblit v1.8.0