From 249575ff2f0d737f4ef01dfb1c09d82078144fda Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 17 三月 2025 15:17:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java
index 7d98caa..21f31b3 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java
@@ -55,8 +55,7 @@
     WorkAssignmentMapper workAssignmentMapper;
 
 
-//        private final static String ERP_URL = "http://192.168.2.100:8086";
-    private final static String ERP_URL = "http://10.153.19.26:8086";
+    private final static String ERP_URL = "http://192.168.2.100:8086";
 
 
     /**

--
Gitblit v1.8.0