Merge remote-tracking branch 'origin/master'

zhoushihao

2025-03-15 5a7683e98e626cba3b52fd621b4d5340e16b6f2a

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java

@@ -55,8 +55,8 @@
    WorkAssignmentMapper workAssignmentMapper;


    private final static String ERP_URL = "http://192.168.2.100:8086";
//    private final static String ERP_URL = "http://10.153.19.174:8086";
//        private final static String ERP_URL = "http://192.168.2.100:8086";
    private final static String ERP_URL = "http://10.153.19.26:8086";


    /**