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

jinpengyong

2023-08-25 5242d687d4edcd6c0f7e10fb82b0e5505dbb3da3

 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;