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

yujian

2020-05-13 3b9e1385a90ae84f97f2a4b8b7a35a6b13c01062

 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;