From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2

---
 fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/AdActivityVersionControl.java |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/AdActivityVersionControl.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/AdActivityVersionControl.java
index 14c72e4..bcaf022 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/AdActivityVersionControl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/AdActivityVersionControl.java
@@ -17,8 +17,12 @@
 public class AdActivityVersionControl {
 
 	public enum AdActivityType {
-		banner// 杞挱鍥�
-		, special// 涓撻
+		banner,// 杞挱鍥�
+		special,// 涓撻
+		floatAD,// 鎮诞鍥�
+		notification,// 灏忛粍鏉�
+		helpClass,// 甯姪涓績鍒嗙被
+		helpCenter;// 甯姪涓績鏂囨。
 	}
 
 	@Column(name = "vc_id")

--
Gitblit v1.8.0