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

chenlu

昨天 a0db8ecfc7f6a560804e94b5834435ce460c00b9

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

@@ -12,10 +12,10 @@
    private String msg;
    private Object data;

    public static  Result seccess(){
    public static  Result success(){
        return new Result(Constants.Code_200,"",null);
    }
    public static  Result seccess(Object data){
    public static  Result success(Object data){
        return new Result(Constants.Code_200,"",data);
    }