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

yujian

2020-03-25 010760fd974453a70948fef465284d8c817314f5

 fanli/src/main/java/com/yeshi/fanli/controller/admin/MessageController.java

@@ -27,7 +27,7 @@


   @RequestMapping(value = "getZhuShou")

   public void getZhuShou(String callback, PrintWriter out) {

      // 返利券小助手

      // 板栗快省小助手

      MsgCommonDTO zhuShouMsg = msgConfigService.getZhuShouMsg();

      JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(new Gson().toJson(zhuShouMsg)));

   }