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

yujian

2020-04-16 c57f9a24c525aa557225b663fa55120a36f99735

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

@@ -109,6 +109,7 @@
   public List<QualityFactory> queryByQuality(long start, int count, String searchKey, Long systemCid, List<Long> listLabId);





   public JSONObject searchWuLiaoV2(SearchFilter sf);



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



}