From d1a0cb5fb1533f54d1f38f5d7a6a69b294afac4c Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期三, 03 七月 2024 15:13:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java b/jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java
index 8843f0d..26ddd2d 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java
@@ -10,16 +10,12 @@
import com.jcdm.main.da.passingStationCollection.service.IDaPassingStationCollectionService;
import com.jcdm.main.om.productionOrde.service.IOmProductionOrdeInfoService;
import com.jcdm.main.plcserver.sub.OPCUaSubscription;
-
import com.kangaroohy.milo.service.MiloService;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.ApplicationArguments;
import org.springframework.boot.ApplicationRunner;
import org.springframework.stereotype.Component;
-import javax.annotation.Resource;
-import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
@@ -43,7 +39,7 @@
private IOmProductionOrdeInfoService omProductionOrdeInfoService;
- @Resource
+ @Autowired
private IDaOpcuaConfigService daOpcuaConfigService;
--
Gitblit v1.9.3