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

admin

2020-06-29 be2b83596b0589cf4f5dcc47bbb3ef40a4876ea9

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



}