From ac208d6f60284be820fe82dfdf44142f02d9e3ef Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 29 七月 2019 10:47:48 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/CommonContentControllerV2.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/CommonContentControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/CommonContentControllerV2.java
index 422d558..24d6b30 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/CommonContentControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/CommonContentControllerV2.java
@@ -80,9 +80,9 @@
 		if (goodsType == null || goodsType == Constant.SOURCE_TYPE_TAOBAO) {
 			list = commonTemplateContentService.getNavList(CommonContentTypeEnum.valueOf(key));
 		} else if (goodsType == Constant.SOURCE_TYPE_JD) {
-			
+			// 鏆傛棤鍒嗙被
 		} else if (goodsType == Constant.SOURCE_TYPE_PDD) {
-			
+			// 鏆傛棤鍒嗙被
 		}
 		
 		if (list == null) {

--
Gitblit v1.8.0