From e97065519838a1ebbee870eefae6eae9f5d91647 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 26 十一月 2019 14:10:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandInfoServiceImpl.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandInfoServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandInfoServiceImpl.java
index d2f3b3f..6e2cf5f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandInfoServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandInfoServiceImpl.java
@@ -347,14 +347,14 @@
 	}
 
 	@Override
-//	@Cacheable(value = "brandCache", key = "'listValidByCidToApp-'+#cid")
+	@Cacheable(value = "brandCache", key = "'listValidByCidToApp-'+#cid")
 	public List<BrandInfo> listValidByCidToApp(Long cid) {
 		if (cid == null)
 			return null;
 		return brandInfoMapper.listValidByCidToApp(cid);
 	}
 
-//	@Cacheable(value = "brandCache", key = "'listValidToApp-'+#start+'-'+#start +'-'+#cid")
+	@Cacheable(value = "brandCache", key = "'listValidToApp-'+#start+'-'+#cid")
 	@Override
 	public List<BrandInfoVO> listValidToApp(long start, int count, Long cid) {
 		List<BrandInfoVO> list = brandInfoMapper.listBrandInfoVO(start, count, cid);

--
Gitblit v1.8.0