修复合并后的问题

648540858

2023-04-18 d295f3c51271c26a5f65c0184bfa27fe1af80f54

 pom.xml

@@ -6,7 +6,7 @@
   <parent>
      <groupId>org.springframework.boot</groupId>
      <artifactId>spring-boot-starter-parent</artifactId>
      <version>2.7.2</version>
      <version>2.7.9</version>
   </parent>

   <groupId>com.genersoft</groupId>
@@ -123,11 +123,9 @@
         <artifactId>spring-boot-starter-security</artifactId>
      </dependency>

      <!-- druid数据库连接池 -->
      <dependency>
         <groupId>com.alibaba</groupId>
         <artifactId>druid-spring-boot-starter</artifactId>
         <version>1.2.11</version>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-jdbc</artifactId>
      </dependency>

      <!-- mysql数据库 -->
@@ -294,7 +292,7 @@
         <plugin>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-maven-plugin</artifactId>
            <version>2.3.5.RELEASE</version>
            <version>2.7.2</version>
            <configuration>
               <includeSystemScope>true</includeSystemScope>
            </configuration>
@@ -319,7 +317,6 @@
               <dateFormat>yyyyMMdd</dateFormat>
            </configuration>
         </plugin>

         <plugin>
            <groupId>org.apache.maven.plugins</groupId>
            <artifactId>maven-surefire-plugin</artifactId>
@@ -328,7 +325,6 @@
               <skipTests>true</skipTests>
            </configuration>
         </plugin>

      </plugins>
      <resources>
         <resource>