Merge branch 'dc-feature'

# Conflicts:
#	pom.xml
#	src/main/resources/application.properties
This commit is contained in:
Lpz
2025-06-05 10:00:41 +08:00
4 changed files with 30 additions and 23 deletions

28
pom.xml
View File

@ -71,6 +71,8 @@
</exclusions>
</dependency>
<!-- 数据库驱动 -->
<!-- 数据库驱动 -->
<dependency>
<groupId>org.postgresql</groupId>
@ -162,6 +164,10 @@
<version>3.0.4</version>
</dependency>
<dependency>
<groupId>org.mybatis.spring.boot</groupId>
<artifactId>mybatis-spring-boot-starter-test</artifactId>
<version>3.0.4</version>
<scope>test</scope>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.17.0</version>
@ -240,28 +246,6 @@
</excludes>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<annotationProcessorPaths>
<path>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct-processor</artifactId>
<version>1.5.5.Final</version>
</path>
</annotationProcessorPaths>
</configuration>
</plugin>
</plugins>
<resources>
<resource>
<directory>src/main/resources</directory>
<includes>
<include>**/*.xml</include>
<include>**/*.properties</include>
</includes>
</resource>
</resources>
</build>
</project>