Merge remote-tracking branch 'origin/master'

yujian

2019-07-12 9d8dfb01ff72c57abad3b80f3d65e81a5354db03

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



}