解决冲突

service-job/pom.xml

@@ -69,6 +69,7 @@
             <version>0.0.1</version>
             <scope>compile</scope>
         </dependency>
+
         <dependency>
             <groupId>com.usky</groupId>
             <artifactId>service-pm-api</artifactId>

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

@@ -22,7 +22,7 @@ public class RyTask {
     private RemoteFireService remoteFireService;
 
     @Autowired
-    private RemotePmService remotePmService;
+    private RemotePmService remoteIotService;
 
     @Autowired
     private RemoteIotTaskService remoteIotTaskService;
@@ -67,28 +67,28 @@ public class RyTask {
         remoteIotTaskService.dataOverviewJobData();
     }
 
-    public void deviceStatus() {
+    public void deviceStatus(){
         System.out.println("deviceStatus start......");
         remoteIotTaskService.deviceStatus();
     }
 
-    public void deviceOffLineAlarm() {
+    public void deviceOffLineAlarm(){
         System.out.println("deviceOffLineAlarm start......");
         remoteIotTaskService.deviceOffLineAlarm();
     }
 
-    public void customInfoStatus() {
+    public void customInfoStatus(){
         System.out.println("customInfoStatus start......");
         remoteIotTaskService.customInfoStatus();
     }
 
-    public void meetingInfoStatus() {
+    public void meetingInfoStatus(){
         System.out.println("meetingInfoStatus start......");
         remoteMeetingService.meetingInfoStatus();
     }
 
     // 报告提交提醒
-    public void reportSubmissionReminder() {
+    public void reportSubmissionReminder(){
         System.out.println("reportSubmissionReminder start......");
         remotePmService.reportSubmissionReminder();
     }