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

admin

2020-02-18 ddf5db7d31af51fcf697eac0cee7dd46ff73bcc1

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

@@ -166,7 +166,8 @@
   //文案转链

   convertDocWebLink("convert_doc_web_link","文案转链网页"),

   convertDocHelpLink("convert_doc_help_link","文案转链帮助网页"),

   convertDocTip("convert_doc_tip","文案转链温馨提示")

   convertDocTip("convert_doc_tip","文案转链温馨提示"),

   newerGonglue("newer_gonglue_url","新手攻略链接")

   ;



   private final String key;