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

admin

2020-05-12 1faf3ab0ba6c17eee48e68e8d0077ea61f45d75d

 fanli/src/main/java/com/yeshi/fanli/service/impl/msg/MsgConfigServiceImpl.java

@@ -54,7 +54,7 @@
         Config config = new Config();

         config.setCreatetime(System.currentTimeMillis() + "");

         config.setKey(KEY_ZHUSHOU);

         config.setName("消息-返利券小助手");

         config.setName("消息-板栗快省小助手");

         config.setValue(new Gson().toJson(dto));

         configService.save(config);

      }