Merge remote-tracking branch 'origin/master'

Administrator

2018-11-13 06a7debe678e7ae30f39c61a7f71a926d52d1ae7

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/lable/QualityFactoryMapper.java

@@ -341,4 +341,10 @@
   
   long countRecommendBykey(@Param("key") String key, @Param("hasQuan") Integer hasQuan,  
         @Param("userType") Integer userType,@Param("startprice") Double startprice, @Param("endprice") Double endprice);


   List<QualityFactory> listQueryBylabIDs(@Param("start") long start, @Param("count") int count, 
         @Param("list") List<Long> list, @Param("gid") Long gid,@Param("systemCid") Long systemCid);


}