From 88d0c70c94711f1bfe2fc7ef7770dcd71d06b596 Mon Sep 17 00:00:00 2001
From: xiangwbs <xiangwbs@163.com>
Date: Wed, 20 Jun 2018 21:03:24 +0800
Subject: [PATCH] merge

---
 boot-web/src/test/java/com/xwbing/BaseTest.java                | 3 +--
 .../src/test/java/com/xwbing/service/SysRoleServiceTest.java   | 2 --
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/boot-web/src/test/java/com/xwbing/BaseTest.java b/boot-web/src/test/java/com/xwbing/BaseTest.java
index e7e8520..312c8cd 100644
--- a/boot-web/src/test/java/com/xwbing/BaseTest.java
+++ b/boot-web/src/test/java/com/xwbing/BaseTest.java
@@ -4,7 +4,6 @@ import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.annotation.Rollback;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.context.web.WebAppConfiguration;
 import org.springframework.test.web.servlet.MockMvc;
@@ -20,7 +19,7 @@ import org.springframework.transaction.annotation.Transactional;
 @SpringBootTest
 @AutoConfigureMockMvc
 @Transactional
-@Rollback(false)
+//@Rollback(false)
 @WebAppConfiguration
 public class BaseTest {
     @Autowired
diff --git a/boot-web/src/test/java/com/xwbing/service/SysRoleServiceTest.java b/boot-web/src/test/java/com/xwbing/service/SysRoleServiceTest.java
index aee90b2..f597859 100644
--- a/boot-web/src/test/java/com/xwbing/service/SysRoleServiceTest.java
+++ b/boot-web/src/test/java/com/xwbing/service/SysRoleServiceTest.java
@@ -19,8 +19,6 @@ import javax.annotation.Resource;
 public class SysRoleServiceTest extends BaseTest {
     @Resource
     private SysRoleService sysRoleService;
-    @Resource
-    private SysRoleMapper sysRoleMapper;
 
     @Test
     public void all() {