Merge remote-tracking branch 'origin/master'

admin

2019-07-30 573c491b4a1ba60e12a5678a01c1546c0077c1ee

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

@@ -13,6 +13,7 @@
import com.yeshi.fanli.entity.bus.clazz.GoodsClass;

import com.yeshi.fanli.exception.brand.BrandClassException;

import com.yeshi.fanli.service.inter.brand.BrandClassService;

import com.yeshi.fanli.service.inter.brand.BrandClassShopService;

import com.yeshi.fanli.service.inter.goods.GoodsClassService;



@Service

@@ -24,6 +25,9 @@
   @Resource

   private GoodsClassService goodsClassService;



   @Resource

   private BrandClassShopService brandClassShopService;

	
   @Override

   public List<BrandClass> listEffective() {

      return brandClassMapper.listEffective();

@@ -110,6 +114,9 @@
   

   @Override

   public int deleteBatchByPrimaryKey(List<Long> list) {

      // 删除已匹配的分类关系

      brandClassShopService.deleteBatchByClassId(list);

		
      return brandClassMapper.deleteBatchByPrimaryKey(list);

   }