From 7b2467a59d3a663fc3d004c852a843f363251029 Mon Sep 17 00:00:00 2001
From: rx <auster_i@163.com>
Date: 星期五, 02 八月 2024 17:22:02 +0800
Subject: [PATCH] Merge branch 'master-0729-功能优化' into master-test

---
 phis-feign/src/main/java/com/hz/phis/vo/order/OrderActivityVo.java |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/phis/vo/order/OrderActivityVo.java b/phis-feign/src/main/java/com/hz/phis/vo/order/OrderActivityVo.java
index aab61db..810fbf4 100644
--- a/phis-feign/src/main/java/com/hz/phis/vo/order/OrderActivityVo.java
+++ b/phis-feign/src/main/java/com/hz/phis/vo/order/OrderActivityVo.java
@@ -14,15 +14,21 @@
     /**娲诲姩鍖哄垎缂栧彿*/
     private String activityPageCode;
 
-    /**鏌ヨ娑堣垂鍜屾墽琛�*/
-    private Boolean selectJoin = false;
-    /**鏌ヨ閲戦*/
+    /**鏌ヨ涓嬪崟鎵ц杩旇禒閲戦鏁版嵁*/
     private Boolean selectMoney = false;
     /**閲戦鐨勬潵婧愮被鍨�*/
     private String operationReason;
-    /**鏌ヨ浼樻儬鍒�*/
+    /**鏌ヨ杩旇禒鐨勪紭鎯犲埜*/
     private Boolean selectCoupon = false;
     /**浼樻儬鍒告潵婧愮被鍨�(CouponRecordDto)*/
     private String couponType;
 
+
+    /**鏌ヨ鍒嗕韩杩旇禒閲戦鏁版嵁*/
+    private Boolean selectShareMoney = false;
+    private String shareOperationReason;
+    /**鏌ヨ杩旇禒浼樻儬鍒告暟鎹�*/
+    private Boolean selectShareCoupon = false;
+    private String shareCouponType;
+
 }

--
Gitblit v1.8.0