Merge branch 'master' of http://120.27.238.55:7000/r/farmer-cms

xiaoyong931011

2022-07-08 e7f9932f6d5bb67dac0de33e9d52d439d9a1a6bf

 src/main/java/com/xcong/farmer/cms/common/response/Result.java

@@ -16,7 +16,7 @@

    private static final long serialVersionUID = 1L;

    private static final int SUCCESS = 0;
    private static final int SUCCESS = 200;

    private static final int FAIL = -1;

@@ -38,6 +38,13 @@
        return result;
    }

    public static Result ok(Object data) {
        Result result = new Result();
        result.code = SUCCESS;
        result.data = data;
        return result;
    }

    public static Result ok(String msg, Object data) {
        Result result = new Result();
        result.code = SUCCESS;