Merge branch 'release/3.0' into dev/dev_xp

# Conflicts:
#	pom.xml
#	src/main/java/com/ai/da/common/utils/SendEmailUtil.java
This commit is contained in:
2024-05-27 13:20:31 +08:00
20 changed files with 137 additions and 65 deletions

View File

@@ -202,6 +202,13 @@
<version>20230618</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>2.17.1</version>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId>