Merge remote-tracking branch 'origin/master'

admin

2018-12-05 21f49216736c547d99ec1dd46a24c6f43f852fc5

 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(2,"没有更多了"));

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

            return;

         }