Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes

ZengTao

2024-01-26 90e0a2c1a18ef254ca0c1863df59e39b98b8e885

 springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java

@@ -17,6 +17,7 @@
        //
        System.out.println("启动完成");

<<<<<<< HEAD
        //  new PlcHold().start();

        // new Plchome().start();
@@ -39,6 +40,32 @@
        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();
    }