From d8359ddb48dab5cc797a9d552e11fde571f4920c Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 27 八月 2019 12:32:46 +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 | 4 ++--
1 files changed, 2 insertions(+), 2 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 a2c2597..71f464b 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
@@ -145,7 +145,7 @@
} else if (type == CommonContentTypeEnum.chaoPinReMai) {
navList = getCommonNav();
} else if (type == CommonContentTypeEnum.mianDan) {
- navList = getCommonNav();
+ navList = new ArrayList<>();
}
return navList;
@@ -184,7 +184,7 @@
} else if (type == CommonContentTypeEnum.haoQuan) {
result = getHaoQuanContent(cid, page, pageSize);
} else if (type == CommonContentTypeEnum.mianDan) {
- result = getHaoQuanContent(cid, page, pageSize);
+ result = getMianDanContent(page, pageSize);
}
if (result != null) {// 鍟嗗搧淇℃伅杩囨护
--
Gitblit v1.8.0