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

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

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

@@ -6,17 +6,17 @@
import java.util.List;



import javax.annotation.Resource;

import javax.transaction.Transactional;



import org.springframework.cache.annotation.Cacheable;

import org.springframework.stereotype.Service;

import org.springframework.transaction.annotation.Transactional;



import com.yeshi.fanli.dao.mybatis.lable.LabelClassMapper;

import com.yeshi.fanli.entity.bus.clazz.GoodsClass;

import com.yeshi.fanli.entity.bus.clazz.GoodsSubClass;

import com.yeshi.fanli.entity.bus.lable.Label;

import com.yeshi.fanli.entity.bus.lable.LabelClass;

import com.yeshi.fanli.exception.LabelClassException;

import com.yeshi.fanli.exception.goods.quality.LabelClassException;

import com.yeshi.fanli.service.inter.lable.LabelClassService;

import com.yeshi.fanli.service.inter.lable.LabelService;



@@ -120,7 +120,7 @@
   

   

   @Override

   @Transactional

   @Transactional(rollbackFor=Exception.class)

   public void addBatchClass(GoodsClass goodsClass,List<Long> labIdList) throws Exception {

      

      long recordId = goodsClass.getId();

@@ -194,7 +194,7 @@
   

   

   @Override

   @Transactional

   @Transactional(rollbackFor=Exception.class)

   public void addBatchSubClass(GoodsSubClass goodsSubClass,List<Long> labIdList) throws Exception {

      

      long recordId = goodsSubClass.getId();