51 Commits a7197fec5b ... 231922e7f9

Autore SHA1 Messaggio Data
  james a7197fec5b Merge branch 'usky-zyj' into server-165 1 mese fa
  james fa54a6f0cb 优化服务器上启动job服务报错的问题 1 mese fa
  james 88e82681b9 Merge branch 'usky-zyj' into server-165 1 mese fa
  james 97e1f79905 Merge branch 'usky-zyj' into server-165 1 mese fa
  james 6ab16f4fa6 Merge branch 'usky-zyj' into server-165 1 mese fa
  james dcb70d1551 Merge branch 'usky-zyj' into server-165 2 mesi fa
  james 69059ff7a8 Merge branch 'usky-zyj' into server-165 2 mesi fa
  james eaf20ea7ae Merge branch 'usky-zyj' into server-165 4 mesi fa
  james ff7dcb7e4a Merge branch 'usky-zyj' into server-165 5 mesi fa
  james a52c8ef0be Merge branch 'usky-zyj' into server-165 5 mesi fa
  james c7f702429d Merge branch 'usky-zyj' into server-165 5 mesi fa
  james 8308cb7c71 Merge branch 'usky-zyj' into server-165 5 mesi fa
  james f0644a54a7 Merge branch 'usky-zyj' into server-165 6 mesi fa
  james ac0b2c0513 Merge branch 'usky-zyj' into server-165 6 mesi fa
  james 3c82913d83 Merge branch 'usky-zyj' into server-165 6 mesi fa
  james 2d197acbf0 Merge branch 'usky-zyj' into server-165 6 mesi fa
  james d83085e401 Merge branch 'usky-zyj' into server-165 6 mesi fa
  james 6f45afccbb Merge branch 'usky-zyj' into server-165 6 mesi fa
  james 6efa874e54 Merge branch 'usky-zyj' into server-165 6 mesi fa
  james 1478befc8b Merge branch 'usky-zyj' into server-165 7 mesi fa
  james f11c36a23f Merge branch 'usky-zyj' into server-165 7 mesi fa
  james 5904e921ed Merge branch 'usky-zyj' into server-165 7 mesi fa
  james 390e60ea85 Merge branch 'usky-zyj' into server-165 7 mesi fa
  james b8a1842058 Merge branch 'usky-zyj' into server-165 7 mesi fa
  james cf135e729d Merge branch 'usky-zyj' into server-165 7 mesi fa
  james 3761de0b7d Merge branch 'usky-zyj' into server-165 7 mesi fa
  james 1cfc49508f Merge branch 'usky-zyj' into server-165 7 mesi fa
  james 11d1028261 Merge branch 'usky-zyj' into server-165 7 mesi fa
  james c60548d9da Merge branch 'usky-zyj' into server-165 7 mesi fa
  james 8982b8bdf1 Merge branch 'usky-zyj' into server-165 7 mesi fa
  james 4cb1bd1399 Merge branch 'usky-zyj' into server-165 7 mesi fa
  james 13ab9e6577 Merge branch 'usky-zyj' into server-165 8 mesi fa
  james a9a9aa9535 Merge branch 'usky-zyj' into server-165 8 mesi fa
  james 496eebe9cf Merge branch 'usky-zyj' into server-165 8 mesi fa
  james 473fc265ca Merge branch 'usky-zyj' into server-165 8 mesi fa
  hanzhengyi 7f8e4cba0b Merge branch 'usky-zyj' of uskycloud/usky-modules into server-165 8 mesi fa
  fuyuchuan c51e561c02 Merge branch 'fu-normal-push' of uskycloud/usky-modules into server-165 8 mesi fa
  james 47d2f491f2 Merge branch 'usky-zyj' into server-165 8 mesi fa
  gez 3a94e1a8c5 Merge branch 'fu-dev' of uskycloud/usky-modules into server-165 8 mesi fa
  james 9cb63ca488 Merge branch 'usky-zyj' into server-165 8 mesi fa
  james 2a08a5679e Merge branch 'usky-zyj' into server-165 8 mesi fa
  james 96abd72144 Merge branch 'usky-zyj' into server-165 8 mesi fa
  james 1e02468958 Merge branch 'usky-zyj' into server-165 8 mesi fa
  james 3fcf4edfbc Merge branch 'usky-zyj' into server-165 8 mesi fa
  james 72688b3972 Merge branch 'usky-zyj' into server-165 8 mesi fa
  james 0eb747cdb8 Merge branch 'usky-zyj' into server-165 8 mesi fa
  james 1060dad4f7 Merge branch 'usky-zyj' into server-165 8 mesi fa
  james 29acf1115c Merge branch 'usky-zyj' into server-165 8 mesi fa
  fuyuchuan ffd0f04a6f Merge branch 'fu-dev' of uskycloud/usky-modules into server-165 8 mesi fa
  fuyuchuan cf3aa1529e Merge branch 'fu-normal-push' of uskycloud/usky-modules into server-165 8 mesi fa
  fuyuchuan 2619a36d0b Merge branch 'fu-dev' of uskycloud/usky-modules into server-165 8 mesi fa

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

@@ -4,6 +4,7 @@ import com.usky.common.core.utils.StringUtils;
 import com.usky.demo.RemoteMeetingService;
 import com.usky.fire.RemoteFireService;
 import com.usky.iot.RemoteIotTaskService;
+import com.usky.pm.RemotePmTaskService;
 import com.usky.pm.RemotePmService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;