From 616b119c283147deef21fbc519291221ba4897b1 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@MS-20170306HGUF>
Date: 星期二, 18 二月 2020 11:30:03 +0800
Subject: [PATCH] Merge branch 'div' of ssh://yujian@193.112.35.168:29418/fanli-server.git into div
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/BrandShopAdminController.java | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/BrandShopAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/BrandShopAdminController.java
index 177b57d..b79d920 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/BrandShopAdminController.java
+++ b/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;
--
Gitblit v1.8.0