From 599cb3a300878dc8b3a579f967fbad4a7eb536e7 Mon Sep 17 00:00:00 2001
From: Andru <769883346@qq.com>
Date: 星期五, 27 十月 2023 16:07:48 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java
index 60a9bc3..c789dff 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java
@@ -97,6 +97,10 @@
     /**闈炲繀濉� 娲诲姩瑙勫垯鏍囪瘑闆嗗悎*/
     private List<String> activityIds;
 
-    /** 娌荤枟鍗昳d */
+    /** 娌荤枟鍗昳d(鐩墠娌$敤) */
     private String treatSingleId;
+    /** 鍒涘缓鏂瑰紡锛圤rderTotalConstants锛� */
+    private String addWay;
+    /**鏄惁鎷煎洟 0 鍚� 1 鏄�*/
+    private Integer isGroupBuy;
 }

--
Gitblit v1.8.0