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

# Conflicts:
#	CanadaMes-ui/src/configuration/Alarm.json
#	CanadaMes-ui/src/configuration/ServoManualone.json
#	CanadaMes-ui/src/views/Electrical/Parameter1.vue
#	CanadaMes-ui/src/views/Electrical/Parameter2.vue
#	CanadaMes-ui/src/views/Electrical/ServoManualone.vue
#	springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter2.java
#	springboot-vue3/src/main/java/com/example/springboot/component/PlcPositioning1.java
#	springboot-vue3/src/main/java/com/example/springboot/component/PlcServoManualone.java
#	springboot-vue3/src/main/java/com/example/springboot/component/Plcalarm.java
#	springboot-vue3/src/main/java/com/example/springboot/component/Plcsign.java
#	springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java
#	springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java
#	springboot-vue3/src/main/java/com/example/springboot/entity/north_glass_buffer1.java
#	springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java
#	springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java