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

admin

2020-03-14 55b3bd7821f14db9e9441d8b34fb9bdc1a9e4df7

 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;