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

guoyujie

2025-08-11 e51e45f2cabcc4628ce93e55c7c3806b1b760161

 north-glass-erp/src/main/java/com/example/erp/common/Result.java

@@ -23,7 +23,7 @@
        return new Result(code,msg,null);
    }
    public static  Result error(){
        return new Result(Constants.Code_500,"系统发生错误",null);
        return new Result(Constants.Code_500,"服务器发生异常",null);
    }

}