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

admin

2019-12-03 8d38972b593b5ba698b0e605039ed8c795eaaef5

 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;