Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb

jinpengyong

2023-08-23 56a4cc005dc961142070e34bd74aef35f8754c6f

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

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

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;