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

admin

2019-09-17 5eab2b71f0749e9f61fc83d9d7e03553e9fa75ef

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

@@ -13,7 +13,7 @@


import com.yeshi.fanli.dao.mybatis.lable.BoutiqueAutoRuleMapper;

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

import com.yeshi.fanli.exception.BoutiqueAutoRuleException;

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

import com.yeshi.fanli.job.QualityFactoryJob;

import com.yeshi.fanli.job.QuartzManager;

import com.yeshi.fanli.log.LogHelper;