update

edu-im/edu-im-server/src/main/java/com/keao/edu/im/service/RoomService.java

@@ -1,12 +1,15 @@
 package com.keao.edu.im.service;
 
-import com.keao.edu.im.common.ApiException;
-import com.keao.deu.im.pojo.*;
-import com.keao.edu.im.pojo.*;
-import com.ym.pojo.*;
-
 import java.util.List;
 
+import com.keao.edu.im.common.ApiException;
+import com.keao.edu.im.pojo.DeviceTypeEnum;
+import com.keao.edu.im.pojo.PlayMidiMessageData;
+import com.keao.edu.im.pojo.ReqChangeUserRoleData;
+import com.keao.edu.im.pojo.ReqDeviceControlData;
+import com.keao.edu.im.pojo.ReqMemberOnlineStatus;
+import com.keao.edu.im.pojo.RoomResult;
+
 /**
  * Created by super_zou on 2019/11/28.
  */

edu-zuul/src/main/java/com/keao/edu/zuul/web/config/SwaggerDocumentConfig.java

@@ -19,12 +19,7 @@ public class SwaggerDocumentConfig implements SwaggerResourcesProvider {
 
 		// 增加服务信息
 		resources.add(swaggerResource("授权服务", "/auth-server/v2/api-docs", "2.0"));
-<<<<<<< HEAD
 		resources.add(swaggerResource("CMS服务", "/cms-server/v2/api-docs", "2.0"));
-=======
-		resources.add(swaggerResource("CMS服务", "/user-server/v2/api-docs", "2.0"));
-		resources.add(swaggerResource("WEB服务", "/web-server/v2/api-docs", "2.0"));
->>>>>>> 2368f0a6633c01029a816f0bdab8aa66d0d5b95e
 		resources.add(swaggerResource("TASK服务", "/task-server/v2/api-docs", "2.0"));
 		return resources;
 	}