From d8359ddb48dab5cc797a9d552e11fde571f4920c Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 27 八月 2019 12:32:46 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

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

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/lable/LabelClassServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/lable/LabelClassServiceImpl.java
index ec9307b..d1ed97f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/lable/LabelClassServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/lable/LabelClassServiceImpl.java
@@ -6,10 +6,10 @@
 import java.util.List;
 
 import javax.annotation.Resource;
-import javax.transaction.Transactional;
 
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import com.yeshi.fanli.dao.mybatis.lable.LabelClassMapper;
 import com.yeshi.fanli.entity.bus.clazz.GoodsClass;

--
Gitblit v1.8.0