Merge remote-tracking branch 'origin/master'

pom.xml

@@ -156,34 +156,34 @@
             <scope>provided</scope>
         </dependency>
         <!--MySQL JDBC驱动-->
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <version>8.0.33</version>
-            <scope>runtime</scope>
-        </dependency>
-        <!--MyBatis 及 插件依赖-->
-        <dependency>
-            <groupId>org.mybatis</groupId>
-            <artifactId>mybatis-spring</artifactId>
-            <!--            <version>1.3.1</version>-->
-            <version>2.0.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.mybatis</groupId>
-            <artifactId>mybatis</artifactId>
-            <version>3.4.4</version>
-        </dependency>
-        <dependency>
-            <groupId>tk.mybatis</groupId>
-            <artifactId>mapper</artifactId>
-            <version>3.4.0</version>
-        </dependency>
-        <dependency>
-            <groupId>com.github.pagehelper</groupId>
-            <artifactId>pagehelper-spring-boot-starter</artifactId>
-            <version>1.2.3</version>
-        </dependency>
+        <!-- <dependency> -->
+        <!--     <groupId>mysql</groupId> -->
+        <!--     <artifactId>mysql-connector-java</artifactId> -->
+        <!--     <version>8.0.33</version> -->
+        <!--     <scope>runtime</scope> -->
+        <!-- </dependency> -->
+        <!-- &lt;!&ndash;MyBatis 及 插件依赖&ndash;&gt; -->
+        <!-- <dependency> -->
+        <!--     <groupId>org.mybatis</groupId> -->
+        <!--     <artifactId>mybatis-spring</artifactId> -->
+        <!--     &lt;!&ndash;            <version>1.3.1</version>&ndash;&gt; -->
+        <!--     <version>2.0.1</version> -->
+        <!-- </dependency> -->
+        <!-- <dependency> -->
+        <!--     <groupId>org.mybatis</groupId> -->
+        <!--     <artifactId>mybatis</artifactId> -->
+        <!--     <version>3.4.4</version> -->
+        <!-- </dependency> -->
+        <!-- <dependency> -->
+        <!--     <groupId>tk.mybatis</groupId> -->
+        <!--     <artifactId>mapper</artifactId> -->
+        <!--     <version>3.4.0</version> -->
+        <!-- </dependency> -->
+        <!-- <dependency> -->
+        <!--     <groupId>com.github.pagehelper</groupId> -->
+        <!--     <artifactId>pagehelper-spring-boot-starter</artifactId> -->
+        <!--     <version>1.2.3</version> -->
+        <!-- </dependency> -->
         <!--阿里 FastJson依赖-->
         <dependency>
             <groupId>com.alibaba</groupId>