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

yujian

2019-09-27 b2cff7a3e9d5cebacef4866c5993e0be89ff5b00

 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;