解决冲突

service-job/src/main/java/com/ruoyi/job/task/RyTask.java

@@ -3,12 +3,8 @@ package com.ruoyi.job.task;
 import com.usky.cdi.AlarmDataSyncTaskService;
 import com.usky.cdi.RemotecdiTaskService;
 import com.usky.common.core.utils.StringUtils;
-<<<<<<< HEAD
 import com.usky.meeting.RemoteMeetingService;
-=======
-import com.usky.demo.RemoteMeetingService;
 import com.usky.ems.RemoteEmsTaskService;
->>>>>>> usky-zyj
 import com.usky.fire.RemoteFireService;
 import com.usky.iot.RemoteIotTaskService;
 import com.usky.pm.RemotePmService;
@@ -35,14 +31,14 @@ public class RyTask {
     private RemoteMeetingService remoteMeetingService;
 
     @Autowired
-<<<<<<< HEAD
     private RemotecdiTaskService remoteCdiTaskService;
 
     @Autowired
     private AlarmDataSyncTaskService alarmDataSyncTaskService;
-=======
+
+    @Autowired
     private RemoteEmsTaskService remoteEmsTaskService;
->>>>>>> usky-zyj
+
 
     public void ryMultipleParams(String s, Boolean b, Long l, Double d, Integer i) {
         System.out.println(StringUtils.format("执行多参方法： 字符串类型{}，布尔类型{}，长整型{}，浮点型{}，整形{}", s, b, l, d, i));