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

admin

2020-06-29 be2b83596b0589cf4f5dcc47bbb3ef40a4876ea9

 fanli/src/main/java/com/yeshi/fanli/service/impl/clazz/GoodsSubClassLabelServiceImpl.java

@@ -15,7 +15,7 @@
import com.yeshi.fanli.entity.bus.clazz.GoodsSubClass;

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

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

import com.yeshi.fanli.exception.GoodsClassException;

import com.yeshi.fanli.exception.goods.GoodsClassException;

import com.yeshi.fanli.service.inter.clazz.GoodsSubClassLabelService;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.vo.goods.GoodsSubClassLabelVO;