Merge branch 'master' of http://39.100.74.100:3000/root/zbn-server

pom.xml

@@ -37,6 +37,7 @@
         <jwt.version>0.9.1</jwt.version>
         <activiti.version></activiti.version>
     </properties>
+
     <dependencies>
 
         <!-- spring-boot-devtools -->
@@ -59,7 +60,6 @@
             <artifactId>mysql-connector-java</artifactId>
         </dependency>
 
-
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context-support</artifactId>
@@ -130,7 +130,6 @@
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
 
-
         <!-- SpringBoot 拦截器 -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -152,7 +151,7 @@
         </dependency>
 
         <!-- SpringBoot集成mybatis框架 -->
-        <dependency>
+        <!--<dependency>
             <groupId>org.mybatis.spring.boot</groupId>
             <artifactId>mybatis-spring-boot-starter</artifactId>
             <version>${mybatis-spring-boot.version}</version>
@@ -177,8 +176,6 @@
             <version>${pagehelper.boot.version}</version>
         </dependency>
 
-
-
         <!-- 获取系统信息 -->
         <dependency>
             <groupId>com.github.oshi</groupId>
@@ -211,7 +208,6 @@
             <artifactId>lombok</artifactId>
         </dependency>
 
-
                 <!-- io常用工具类 -->
         <dependency>
             <groupId>commons-io</groupId>