From bc798685f11aeec95e64c25b0a4594d8876d881d Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期五, 02 八月 2024 14:25:12 +0800
Subject: [PATCH] Merge branch 'master-base' 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