Merge branch 'cjl' into dev

cjl

2023-08-26 6d4ee331b8fa5fc65a7a875a54b32118e9cd903f

 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;