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

admin

2020-07-01 055fb8d085efd7e120d69aba6c0fbb8db5867553

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

@@ -150,6 +150,7 @@
   userProtocolHomeData("user_protocol_home_data", "用户协议首页内容"),
   serviceProtocolLink("service_protocol_link", "服务协议"),
   privacyProtocolLink("privacy_protocol_link", "隐私协议"),
   accountLogoutProtocolLink("account_logout_protocol_link", "账户注销协议"),

   shareOpenJD("share_jd_open", "京东商品是否开启分享"),
   jdApiSearchKey("jd_api_search_key", "京东API是否搜索"),