From d687ff755f0f3022dcd1f57a03104b0e91536ab3 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 27 五月 2025 08:33:29 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/MES_Projects

---
 玻璃公司项目/gmms_nglass/src/main/java/com/northglass/service/device/DeviceService.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git "a/\347\216\273\347\222\203\345\205\254\345\217\270\351\241\271\347\233\256/gmms_nglass/src/main/java/com/northglass/service/device/DeviceService.java" "b/\347\216\273\347\222\203\345\205\254\345\217\270\351\241\271\347\233\256/gmms_nglass/src/main/java/com/northglass/service/device/DeviceService.java"
index f8a5009..aed4e9c 100644
--- "a/\347\216\273\347\222\203\345\205\254\345\217\270\351\241\271\347\233\256/gmms_nglass/src/main/java/com/northglass/service/device/DeviceService.java"
+++ "b/\347\216\273\347\222\203\345\205\254\345\217\270\351\241\271\347\233\256/gmms_nglass/src/main/java/com/northglass/service/device/DeviceService.java"
@@ -196,7 +196,7 @@
 	public void connect() {
 //		shelfService.connect();
 //		measureMachineService.connect();
-		loadMachineService.connect();
+		/*loadMachineService.connect();
 		cutMachineService.connect();
 		identifyMachineService.connect();
 		arrangeMachineService.connect();
@@ -204,7 +204,7 @@
 		gaoliweiMachineService.connect();
 		edgeMachineService.connect();
 		washMachineService.connect();
-		countMachineService.connect();
+		countMachineService.connect();*/
 	}
 
 	public List<Device> deviceManage() {

--
Gitblit v1.8.0