From d621324bcf6c5a26f058b24e0f4d2930f41840f4 Mon Sep 17 00:00:00 2001 From: rx <auster_i@163.com> Date: 星期一, 05 八月 2024 18:45:50 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master-base' into master-prod-new --- phis-feign/src/main/java/com/hz/phis/vo/order/OrderActivityVo.java | 30 +++++++++++++++++++++++------- 1 files changed, 23 insertions(+), 7 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 7f47b21..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 @@ -7,12 +7,28 @@ */ @Data public class OrderActivityVo { - /**娲诲姩椤甸潰绫诲瀷-鎸囧畾璁㈠崟鏍囪瘑*/ - private String orderId; - /**娲诲姩椤甸潰绫诲瀷-鍙┖*/ - private Integer activityPageType; - /**娲诲姩鍖哄垎缂栧彿-蹇呭~*/ - private String activityPageCode; - /**his鐢ㄦ埛-蹇呭~*/ + /**鐢ㄦ埛hisId-蹇呭~*/ private String userId; + /**閭�璇蜂汉hisId*/ + private String inviteeUserId; + /**娲诲姩鍖哄垎缂栧彿*/ + private String activityPageCode; + + /**鏌ヨ涓嬪崟鎵ц杩旇禒閲戦鏁版嵁*/ + 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