From d621324bcf6c5a26f058b24e0f4d2930f41840f4 Mon Sep 17 00:00:00 2001
From: rx <auster_i@163.com>
Date: 星期一, 05 八月 2024 18:45:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-base' into master-prod-new

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

diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderCountShouldTotalDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderCountShouldTotalDto.java
index c25aab6..ec8cf08 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrderCountShouldTotalDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderCountShouldTotalDto.java
@@ -17,6 +17,8 @@
     private String shopId;
     //鐢ㄦ埛浼樻儬鍒�
     private String couponNumberId;
+    //璁㈠崟搴斾粯閲戦
+    private  BigDecimal shouldTotal;
     //鍟嗗搧item淇℃伅
     private List<OrderCountShouldTotalItemDto> itemDtoList;
 }

--
Gitblit v1.8.0