Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-11-04 148af6b2f57be264c84d0991237fbd7ddea491a4

 fanli/src/main/java/com/yeshi/fanli/service/impl/lable/LabelServiceImpl.java

@@ -23,7 +23,7 @@
import com.yeshi.fanli.entity.bus.lable.Label;

import com.yeshi.fanli.entity.bus.lable.LabelGoods;

import com.yeshi.fanli.entity.common.AdminUser;

import com.yeshi.fanli.exception.LabelException;

import com.yeshi.fanli.exception.goods.quality.LabelException;

import com.yeshi.fanli.service.inter.lable.LabelService;

import com.yeshi.fanli.util.StringUtil;