From f392f9d594095738ba4d82885251de40b752f843 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期五, 26 一月 2024 15:02:55 +0800
Subject: [PATCH] 代码更新
---
springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java | 29 ++---------------------------
1 files changed, 2 insertions(+), 27 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java b/springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java
index 421c746..66ecc7f 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java
@@ -17,35 +17,11 @@
//
System.out.println("鍚姩瀹屾垚");
-<<<<<<< HEAD
// new PlcHold().start();
- // new Plchome().start();
- new PlcLayout().start();
- new Plcalarm().start();
-
- new Plcsign().start();
-
- new Plcstate().start();
- new PlcPositioning1().start();
-
- new PlcParameter2().start();
-
- new PLCAutomaticParameterSetting().start();
-
- new PlcManualonePosition().start();
- new PlcManualonePosition2().start();
- new PlcServoManualone().start();
- new PLCManualJog().start();
- new Plclog().start();
-
- new PlcInteractionState().start();
-=======
- // new PlcHold().start();
new PLCAutoMes().start();
- // new PLCAutomaticParameterSettingReview2().start();
-
- //new Plchome().start();
+ new Plchome().start();
+
// new PlcLayout().start();
// new Plcalarm().start();
@@ -65,7 +41,6 @@
// new Plclog().start();
// new PlcInteractionState().start();
->>>>>>> f66c565a395e10901fc71abcfa37f4ff5a15be09
//new PlcParameter1Review().start();
// new PLCAutomaticParameterSettingReview().start();
}
--
Gitblit v1.8.0