Merge branch 'div_10'

yujian

2019-05-14 efa2645b74ebfadc43ebe448370adb22aecc1ad7

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

   }

	
}