From 626317c580cce67668481e48e10fc4a4fb818678 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 19 八月 2019 09:31:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mater-1.6.0' into mater-1.6.0

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/lable/TaoKeGoodsService.java |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/lable/TaoKeGoodsService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/lable/TaoKeGoodsService.java
index 317214c..f81531c 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/lable/TaoKeGoodsService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/lable/TaoKeGoodsService.java
@@ -108,6 +108,7 @@
 	 */
 	public List<QualityFactory> queryByQuality(long start, int count, String searchKey, Long systemCid, List<Long> listLabId);
 
-	
-	
+
+	public JSONObject searchWuLiaoV2(SearchFilter sf);
+
 }

--
Gitblit v1.8.0