From 7a512d4a8b10fad9fb0aa75d6105955f033e1ee9 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期五, 07 六月 2024 15:37:22 +0800
Subject: [PATCH] Merge branch 'master-fwq-爆款活动2.0' into master-test
---
phis-feign/src/main/java/com/hz/phis/vo/order/OrderActivityVo.java | 25 ++++++++++++++-----------
1 files changed, 14 insertions(+), 11 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 f9aa785..aab61db 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
@@ -2,24 +2,27 @@
import lombok.Data;
-import java.util.List;
-
/**
* @author CJH
*/
@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 selectJoin = false;
+ /**鏌ヨ閲戦*/
+ private Boolean selectMoney = false;
/**閲戦鐨勬潵婧愮被鍨�*/
private String operationReason;
- /**杩旇禒閲戦鍙備笌鐨勬椿鍔�*/
- private List<String> codeList;
+ /**鏌ヨ浼樻儬鍒�*/
+ private Boolean selectCoupon = false;
+ /**浼樻儬鍒告潵婧愮被鍨�(CouponRecordDto)*/
+ private String couponType;
+
}
--
Gitblit v1.8.0