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

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

 fanli/src/main/java/com/yeshi/fanli/entity/system/ConfigCategory.java

@@ -31,6 +31,7 @@
      maskControl("遮罩控制"), 
      guanXuan("官宣任务"), 
      specialHelper("小助手"), 
      article("学院相关"), 
      extract("提现相关");

      private final String desc;