Merge remote-tracking branch 'origin/div' into div

yujian

2020-05-14 6cb04a3c75f46001a55be402c6650d5600748dc7

 fanli/src/main/java/com/yeshi/fanli/service/inter/lable/TaoKeGoodsService.java

@@ -108,6 +108,8 @@
    */

   public List<QualityFactory> queryByQuality(long start, int count, String searchKey, Long systemCid, List<Long> listLabId);



	
	




   public JSONObject searchWuLiaoV2(SearchFilter sf,String platform,String version);



}