Merge branch 'master' into dev/1078-newUI

# Conflicts: # src/main/resources/application.yml
2025-05-10 08:59:45 +08:00
parent e754d0d804 e22d96cfb7
commit 3b7ba3eb46
378 changed files with 48292 additions and 475 deletions
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -2,4 +2,4 @@ spring:
  application:
    name: wvp
  profiles:
-    active: 1078
+    active: 1078