From 9102806e784fff6ebbd8773f2f07f8e5768de702 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期五, 23 二月 2024 09:47:33 +0800
Subject: [PATCH] 代码更新
---
springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java | 61 +++++++++---------------------
1 files changed, 18 insertions(+), 43 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..1ec9b0b 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,56 +17,31 @@
//
System.out.println("鍚姩瀹屾垚");
-<<<<<<< HEAD
// new PlcHold().start();
+ // new PLCAutoMes().start();
- // new Plchome().start();
- new PlcLayout().start();
- new Plcalarm().start();
+ new Plchome().start();
+ // new PlcLayout().start();
+ // new Plcalarm().start();
- new Plcsign().start();
+ // new Plcsign().start();
- new Plcstate().start();
- new PlcPositioning1().start();
+ // new Plcstate().start();
+ // new PlcPositioning1().start();
- new PlcParameter2().start();
+ // new PlcParameter2().start();
+ // new PLCAutomaticParameterSetting().start();
- new PLCAutomaticParameterSetting().start();
+ // new PlcManualonePosition().start();
+ // new PlcManualonePosition2().start();
+ // new PlcServoManualone().start();
+ // new PLCManualJog().start();
+ // new Plclog().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 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();
->>>>>>> f66c565a395e10901fc71abcfa37f4ff5a15be09
+ // new PlcInteractionState().start();
//new PlcParameter1Review().start();
- // new PLCAutomaticParameterSettingReview().start();
+ //new PLCAutomaticParameterSettingReview2().start();
+
+ // new PLCManualJogReview().start();
}
}
\ No newline at end of file
--
Gitblit v1.8.0