Merge remote-tracking branch 'origin/div' into 2.1.2

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

 fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/AdActivityVersionControl.java

@@ -19,6 +19,8 @@
   public enum AdActivityType {

      banner,// 轮播图

      special,// 专题

      floatAD,// 悬浮图

      notification,// 小黄条

      helpClass,// 帮助中心分类

      helpCenter;// 帮助中心文档

   }