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

admin

2019-10-29 54ae34b91644b02c422b41197ae6ce33f4e3ca57

 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;