Merge remote-tracking branch 'origin/wb' into qa

jinpengyong

2023-10-16 f26786e162241b6b803ada6d19d80e1f5fb615e5

 screen-api/src/main/java/com/moral/api/config/websocket/WebSocketConfig.java

@@ -1,7 +1,8 @@
package com.moral.api.config.websocket;

import com.moral.api.websocket.CruiserWebSocketServer;


import com.moral.api.websocket.CruiserWebSocketServer;
import com.moral.api.websocket.SingleDeviceServer;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
@@ -16,6 +17,7 @@
 * @Date 2021/6/15 13:53
 * @Version TODO
 **/

@Configuration
public class WebSocketConfig {