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

yujian

2019-11-26 0ffd316f9fb2c967f9d643c6a45a965511566aea

 fanli/src/main/java/com/yeshi/fanli/controller/admin/LableAdminController.java

@@ -26,7 +26,7 @@
import com.google.gson.reflect.TypeToken;

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

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.AdminUserService;

import com.yeshi.fanli.service.inter.config.ConfigService;

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