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

yujian

2020-05-14 6cb04a3c75f46001a55be402c6650d5600748dc7

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

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