Merge branch 'master' of http://192.168.168.218/wcyuee/szpt

pom.xml

@@ -64,11 +64,11 @@
       <artifactId>mybatis-plus-boot-starter</artifactId>
       <version>3.3.1</version>
     </dependency>
-
+<!--    升级pagehelper版本，解决提示no MyBatis mapper was found的错误-->
     <dependency>
       <groupId>com.github.pagehelper</groupId>
       <artifactId>pagehelper-spring-boot-starter</artifactId>
-      <version>1.2.5</version>
+      <version>1.2.13</version>
       <exclusions>
         <exclusion>
           <groupId>org.mybatis</groupId>

src/main/java/com/zksy/szpt/Main.java

@@ -4,7 +4,6 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration;
-import org.springframework.boot.web.servlet.ServletComponentScan;
 
 /**
  * Hello world!