Merge remote-tracking branch 'origin/master'

rentaiming

2024-05-31 23e78efefd96d28f0c492348f3cb8a9e6cdcbbab

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/WebSocketTestController.java

@@ -1,9 +1,9 @@
package com.ruoyi.system.controller;

import com.ruoyi.system.api.util.WebSocketUsers;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import util.WebSocketUsers;

@RestController
@RequestMapping("/websocket")