发布新版本1.0.26-SNAPSHOT

2021-02-22 11:43:00 +08:00
parent 5142402f03
commit 5e31ff2456
4 changed files with 11 additions and 21 deletions
--- a/modules/mogo-realtime/src/main/java/com/mogo/realtime/spi/RealTimeProviderDelegateManager.java
+++ b/modules/mogo-realtime/src/main/java/com/mogo/realtime/spi/RealTimeProviderDelegateManager.java
@@ -3,12 +3,8 @@ package com.mogo.realtime.spi;

 import com.elegant.spi.AbstractDelegateManager;
 import com.mogo.cloud.passport.MoGoAiCloudClient;
-<<<<<<< HEAD
-import com.mogo.realtime.Interface.IRealTimeProvider;
 import com.mogo.utils.logger.Logger;
-=======
 import com.mogo.realtime.api.IRealTimeProvider;
->>>>>>> 17b3ed341e822ad073ace72a78b08f26214c0059

 /**
 * 提供RealTime SPI接口实例对象管理类