From 32f8ab2806fb088335e24983477f5179064ada9d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 29 十一月 2019 17:37:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

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

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/brand/BrandInfoService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/brand/BrandInfoService.java
index 38ad3b8..526c956 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/brand/BrandInfoService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/brand/BrandInfoService.java
@@ -44,9 +44,9 @@
 	 * @param state
 	 * @return
 	 */
-	public List<BrandInfo> listQuery(long start, int count, String key, Long cid, Integer state);
+	public List<BrandInfo> listQuery(long start, int count, List<String> keys, Long cid, Integer state, Integer showState);
 
-	public long countQuery(String key, Long cid, Integer state);
+	public long countQuery(List<String> keys, Long cid, Integer state, Integer showState);
 
 	/**
 	 * 鏌ヨ鍝佺墝杩斿洖鍓嶇

--
Gitblit v1.8.0