From e53fcbe9fe844b7788b29c5106c1ac24d17c5535 Mon Sep 17 00:00:00 2001 From: 935090232@qq.com <ak473600000> Date: Sat, 08 May 2021 22:40:19 +0800 Subject: [PATCH] Merge branch 'score_shop' into api_score_meger --- zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopActivities.java | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopActivities.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopActivities.java index 5cbb9a8..84d0d00 100644 --- a/zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopActivities.java +++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopActivities.java @@ -34,6 +34,10 @@ * 活动类型 签到 */ public static final int ACTIVITIES_TYPE_SIGN = 4; + /** + * 活动类型转盘抽奖 + */ + public static final int ACTIVITIES_TYPE_LUCKYDRAW = 5; /** * 活动状态 开启 @@ -86,7 +90,7 @@ private Integer actStatus; //未发布 - public static final int ACTSTATUS_STATUS_RELEASE = 2; + public static final int ACTSTATUS_STATUS_RELEASE = 1; //未开始 public static final int ACTSTATUS_STATUS_READY = 2; //进行中 -- Gitblit v1.9.1