Merge branch 'wvp-28181-2.0'

# Conflicts: # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
2022-10-17 16:56:13 +08:00
parent 6a2ff99515 7918f03734
commit 82fd369ce5
31 changed files with 502 additions and 361 deletions
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/user/UserController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/user/UserController.java
@@ -125,8 +125,8 @@ public class UserController {
        }
    }

-    @DeleteMapping("/删除用户")
-    @Operation(summary = "停止视频回放")
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除用户")
    @Parameter(name = "id", description = "用户Id", required = true)
    public void delete(@RequestParam Integer id){
        // 获取当前登录用户id