解决合并冲突

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
This commit is contained in:
donghongyu
2022-02-25 17:36:07 +08:00
parent eeaa016393
commit 632bafabe5

View File

@@ -34,7 +34,6 @@ import com.zhidao.support.adas.high.bean.IPCUpgradeInfo
import com.zhidao.support.adas.high.common.CupidLogUtils
import io.netty.channel.Channel
import java.util.concurrent.TimeUnit
import com.zhidao.support.adas.high.AdasOptions
import io.netty.channel.ChannelFuture
import java.util.*