From 9f6e37f3d6320fa5b3f4f30bc9bd7c357eeb96e7 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期六, 07 十月 2023 10:46:47 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-fwq抽奖配置

---
 phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java |    4 +++-
 1 files changed, 3 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..bee390c 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,8 @@
     /**闈炲繀濉� 娲诲姩瑙勫垯鏍囪瘑闆嗗悎*/
     private List<String> activityIds;
 
-    /** 娌荤枟鍗昳d */
+    /** 娌荤枟鍗昳d(鐩墠娌$敤) */
     private String treatSingleId;
+    /** 鍒涘缓鏂瑰紡锛圤rderTotalConstants锛� */
+    private String addWay;
 }

--
Gitblit v1.8.0