From 5eab2b71f0749e9f61fc83d9d7e03553e9fa75ef Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 17 九月 2019 16:58:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/brand/BrandInfoMapper.java |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/brand/BrandInfoMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/brand/BrandInfoMapper.java
index e82f6ea..b1bc3b9 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/brand/BrandInfoMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/brand/BrandInfoMapper.java
@@ -25,11 +25,14 @@
 	long countBrandInfo(@Param("cid") Long cid);
 	
 	
+	
+	
 	/**
 	 * 鏌ヨ鏈夋晥搴楅摵
-	 * @param cid
+	 * @param start
+	 * @param count
 	 * @return
 	 */
-	List<BrandInfoVO> listValidBrandInfoCache(@Param("cid") Long cid);
+	List<BrandInfo> listValidAll(@Param("start")long start, @Param("count")int count);
 	
 }
\ No newline at end of file

--
Gitblit v1.8.0