From 183c3ed6b30e3edf5e44c8bd2128d3be968bc1f4 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期一, 20 五月 2024 13:47:50 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java | 42 +++---------------------------------------
1 files changed, 3 insertions(+), 39 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..19cf514 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,20 @@
//
System.out.println("鍚姩瀹屾垚");
-<<<<<<< HEAD
- // new PlcHold().start();
-
- // new Plchome().start();
+ 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 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 PlcParameter1Review().start();
- // new PLCAutomaticParameterSettingReview().start();
+
}
}
\ No newline at end of file
--
Gitblit v1.8.0