Merge remote-tracking branch 'origin/master'

admin

2019-06-27 ab9e60fa9a8e43d797446730a5dc9ebfb6b3f4e6

 fanli/src/main/java/com/yeshi/fanli/service/impl/goods/GoodsSubClassServiceImpl.java

@@ -204,7 +204,7 @@
         }



         goodsSubClassMapper.insert(record);

			


         if (labelId != null) {

            GoodsSubClassLabelMap map = new GoodsSubClassLabelMap();

            map.setGoodsSubClass(record);

@@ -250,7 +250,10 @@
            GoodsSubClassLabelMap map = new GoodsSubClassLabelMap();

            map.setGoodsSubClass(record);

            map.setLabel(new GoodsSubClassLabel(labelId));

            goodsSubClassLabelService.addSubClassLabelMap(map);

            try {

               goodsSubClassLabelService.addSubClassLabelMap(map);

            } catch (Exception e) {

            }

         }



         goodsSubClassMapper.updateByPrimaryKey(record);