Merge remote-tracking branch 'origin/master'

admin

2019-05-15 7b9a96b619c3da31011e0dc555ffd7362621d701

 fanli/src/main/java/com/yeshi/fanli/service/impl/lable/QualityGoodsServiceImpl.java

@@ -388,4 +388,14 @@
      return qualityFactoryMapper.countFreeGoods(tkRate, lableName);

   }

   

   @Override

   public List<QualityFactory> listByShopId(long start, int count, Long shopId) {

      return qualityFactoryMapper.listByShopId(start, count, shopId);

   }

	
   @Override

   public long countByShopId(Long shopId) {

      return qualityFactoryMapper.countByShopId(shopId);

   }

	
}