Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-11-01 b56c7f8fa63e0150f621b02f425053ce0d48c2f1

 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);



}