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

admin

2020-07-01 5a37edc8cb5e4fb62e374d55b504843d2f5a4a6c

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

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

      private final String desc;