From 90e0a2c1a18ef254ca0c1863df59e39b98b8e885 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期五, 26 一月 2024 13:52:11 +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 | 29 ++++++++++++++++++++++++++++-
1 files changed, 28 insertions(+), 1 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 e609d7f..421c746 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,9 +17,35 @@
//
System.out.println("鍚姩瀹屾垚");
+<<<<<<< HEAD
// new PlcHold().start();
- new Plchome().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();
@@ -39,6 +65,7 @@
// new Plclog().start();
// new PlcInteractionState().start();
+>>>>>>> f66c565a395e10901fc71abcfa37f4ff5a15be09
//new PlcParameter1Review().start();
// new PLCAutomaticParameterSettingReview().start();
}
--
Gitblit v1.8.0