From bd331a582851cffcce54316e677e23760de4f384 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 24 六月 2019 11:36:49 +0800
Subject: [PATCH] 冲突文件
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/activity/ActivityRuleUser.java | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/activity/ActivityRuleUser.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/activity/ActivityRuleUser.java
index b76bc3a..99ae971 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/activity/ActivityRuleUser.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/activity/ActivityRuleUser.java
@@ -33,6 +33,7 @@
public final static int RULE_HOT_HUWAI = 100 + 13;
public final static int RULE_HOT_XIANGBAO = 100 + 11;
public final static int RULE_HAOHUO = 200;
+ public final static int RULE_HAODIAN = 300;
public static ActivityUserRule[] RULES = new ActivityUserRule[] { new ActivityUserRule(RULE_DEFAULT, "榛樿"),
new ActivityUserRule(RULE_HOT, "鍗曞搧鐑攢"), new ActivityUserRule(RULE_HOT_JUJIA, "灞呭鐧捐揣"),
--
Gitblit v1.8.0