From 2ff5b9cca256aa37fc06e5fec218a056462a6465 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 17 十二月 2019 16:57:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/BrandControllerV2.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/BrandControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/BrandControllerV2.java
index 2ad5d7a..e347e07 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/BrandControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/BrandControllerV2.java
@@ -762,7 +762,7 @@
data.put("shopList", JsonUtil.getApiCommonGson().toJson(shopList));
}
- data.put("count", 50);
+ data.put("count", array.size());
data.put("list", array);
out.print(JsonUtil.loadTrueResult(data));
}
--
Gitblit v1.8.0