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

admin

2019-10-22 04f5c3bd20524c97dce07cc03bb24e190303083a

 fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandClassServiceImpl.java

@@ -28,6 +28,13 @@
   @Resource

   private BrandClassShopService brandClassShopService;

   

	
   @Override

   public BrandClass selectByPrimaryKey(Long id) {

       return brandClassMapper.selectByPrimaryKey(id);

   }

	
	
   @Override

   public List<BrandClass> listEffective() {

      return brandClassMapper.listEffective();