Merge branch 'master' of http://bore.pub:10439/r/ERP_override

chenlu

2024-08-29 f32fa90bb4c5706507033b62e0c0da4435d3587f

 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);
    }

}