Merge branch 'master' into 重构/1078

# Conflicts: # src/main/java/com/genersoft/iot/vmp/service/bean/InviteErrorCode.java # src/main/resources/application.yml
2025-05-29 17:10:32 +08:00
parent 0c29c90d3b ec9a0bcc76
commit 1420fcfcd0
24 changed files with 1404 additions and 245 deletions
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@

    <groupId>com.genersoft</groupId>
    <artifactId>wvp-pro</artifactId>
-    <version>2.7.3</version>
+    <version>2.7.4</version>
    <name>web video platform</name>
    <description>国标28181视频平台</description>
    <packaging>${project.packaging}</packaging>