Merge branch 'master' into dev-moneydetail

admin

2018-12-19 d1bf4588a39bcba69fd39f3cc3b3a6c439e25cb6

 fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5HelpCenterController.java

@@ -52,7 +52,7 @@
               helpCenterService.queryIdAndTitle((pageIndex - 1) * pageSize, pageSize, key);

         

         if (helpCenterList == null || helpCenterList.size() == 0) {

            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("暂无数据"));

            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(2, "没有更多了"));

            return;

         }