Merge remote-tracking branch 'origin/master'

admin

2019-05-05 d1fe0aeb6aa1f205c6cfae319ebc91f33c1db3f6

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

@@ -6,10 +6,10 @@
import java.util.Map;



import javax.annotation.Resource;

import javax.transaction.Transactional;



import org.quartz.Scheduler;

import org.springframework.stereotype.Service;

import org.springframework.transaction.annotation.Transactional;



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

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