From 2bbf2a6d0b13772aa5254cb9e9271bd2e41d4061 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 30 九月 2024 18:47:53 +0800
Subject: [PATCH] Merge branch 'master-stander' into master-jiayan

---
 phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 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 bee390c..50a7ae6 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
@@ -20,9 +20,11 @@
     /**蹇呭~ 璁㈠崟绫诲瀷锛圤rderTotalConstants锛�,,crm濉粯璁roject,鍏呭�煎氨濉玶echarge,绾晢鍝佽鍗曞~retail闆跺敭*/
     private String type;
 
-    /**蹇呭~ 骞冲彴鏉ユ簮:鏉ユ簮搴旂敤appId(鍒涘缓璁㈠崟骞冲彴,绯荤粺榛樿) */
+    /**浣跨敤浼犲�肩殑骞冲彴鏉ユ簮:0鍚�1鏄紝榛樿鍚�*/
+    private Integer usedTransmitApp = 0;
+    /**骞冲彴鏉ユ簮:鏉ユ簮搴旂敤appId(鍒涘缓璁㈠崟骞冲彴,绯荤粺榛樿),浣跨敤浼犲�肩殑骞冲彴鏉ユ簮蹇呭~ */
     private String appId;
-    /**蹇呭~ 鏉ユ簮搴旂敤缂栫爜(鍟嗘埛璁剧疆骞冲彴缂栫爜,绯荤粺榛樿,浠g爜蹇呭~) */
+    /**鏉ユ簮搴旂敤缂栫爜(鍟嗘埛璁剧疆骞冲彴缂栫爜,绯荤粺榛樿,浠g爜蹇呭~),浣跨敤浼犲�肩殑骞冲彴鏉ユ簮蹇呭~ */
     private String appIdCode;
 
     /*蹇呭~ 閿�鍞鍗曟潵婧�,閿�鍞彲浠ラ�夋嫨
@@ -101,4 +103,13 @@
     private String treatSingleId;
     /** 鍒涘缓鏂瑰紡锛圤rderTotalConstants锛� */
     private String addWay;
+    /**鏄惁鎷煎洟 0 鍚� 1 鏄�*/
+    private Integer isGroupBuy;
+
+    /**娲诲姩椤甸潰绫诲瀷锛�0榛樿鏍囧噯锛夛紝濡傛灉闇�瑕佺壒闇�澶勭悊锛屽~鍐欒繖涓紝榛樿0*/
+    private Integer activityPageType = 0;
+    /**娲诲姩鍖哄垎缂栧彿-鐢ㄤ簬涓�娆℃�ф椿鍔紝瀛樺偍娲诲姩缂栧彿锛屼究浜庢煡鎵�*/
+    private String activityPageCode;
+    /**娲诲姩鍖哄垎鏍囬*/
+    private String activityPageName;
 }

--
Gitblit v1.8.0