From 010efba33ae0e00ff06e5a95004e0f624f073ba7 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 17 七月 2019 15:34:45 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/goods/CommonTemplateContentServiceImpl.java |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/CommonTemplateContentServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/CommonTemplateContentServiceImpl.java
index 864f8da..f33299c 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/CommonTemplateContentServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/CommonTemplateContentServiceImpl.java
@@ -151,6 +151,9 @@
 	}
 
 	private CommonContentResult get9K9Content(String cid, int page, int pageSize) {
+		if (pageSize == 20)
+			pageSize = 50;
+
 		DaTaoKeGoodsResult result = null;
 		if ("-1".equalsIgnoreCase(cid)) {
 			result = DaTaoKeApiUtil.search("", null, null, new BigDecimal("10"), page, pageSize,

--
Gitblit v1.8.0