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

admin

2020-04-15 3d92fcd729376c584a07d5f23b8e06f81fbcbcde

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

@@ -114,7 +114,6 @@


      try {

         List<BrandClass> list = brandClassService.listQuery((pageIndex - 1) * pageSize, pageSize, key, state);



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

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

            return;