冲突

yujian

2019-05-09 2764ae2d7f4d9cb9810a2188c92cb2eb439c3f22

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

@@ -332,4 +332,17 @@
   
   long countFreeGoods(@Param("tkRate") Double tkRate, @Param("lableName") String lableName);

	
   /**
    * 根据店铺信息获取商品
    * @param start
    * @param count
    * @param shopId
    * @return
    */
   List<QualityFactory> listByShopId(@Param("start") long start, @Param("count") int count, 
         @Param("shopId") Long shopId);
	
   long countByShopId(@Param("shopId") Long shopId);

}