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

yujian

2019-10-16 a3e1aec60d2f886b8c48966c889b567719d0c5ea

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

@@ -18,7 +18,7 @@
import com.yeshi.fanli.entity.bus.clazz.TaoBaoClass;

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

import com.yeshi.fanli.entity.taobao.TaobaoMeterial;

import com.yeshi.fanli.exception.BoutiqueAutoRuleException;

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

import com.yeshi.fanli.service.inter.goods.GoodsClassService;

import com.yeshi.fanli.service.inter.goods.TaoBaoClassService;

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