From e57271b299b6568fd00e8046b79befbb1f224d2c Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 14 五月 2019 15:06:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/lable/BoutiqueAutoRuleServiceImpl.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/lable/BoutiqueAutoRuleServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/lable/BoutiqueAutoRuleServiceImpl.java
index 1a74d8b..9505e13 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/lable/BoutiqueAutoRuleServiceImpl.java
+++ b/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;

--
Gitblit v1.8.0