Merge remote-tracking branch 'origin/release/3.0' into dev/dev

# Conflicts: # pom.xml # src/main/java/com/ai/da/common/utils/SendEmailUtil.java # src/main/java/com/ai/da/service/impl/WorkspaceServiceImpl.java
2024-05-27 15:03:02 +08:00
parent 50e46fed02 37de7d9276
commit 8b274b2822
18 changed files with 131 additions and 74 deletions
--- a/pom.xml
+++ b/pom.xml
@@ -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>