Merge branch 'dev/dev' into dev/dev_xp

# Conflicts: # src/main/java/com/ai/da/service/impl/WorkspaceServiceImpl.java
2024-05-27 15:13:20 +08:00
parent 54cbaf4b80 b1b4b4147c
commit eda92b3f0b
8 changed files with 140 additions and 29 deletions
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -5,4 +5,4 @@
 #spring.profiles.active=prod

 #<23><><EFBFBD><EFBFBD>application-dev<65>ļ<EFBFBD>(<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)
-spring.profiles.active=prod
+spring.profiles.active=dev