Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

java110

2021-09-04 576c52d8d8e6fb1e738380cc5fc101a6a2b0b3a8

 java110-bean/src/main/java/com/java110/vo/ResultVo.java

@@ -28,6 +28,7 @@

    public static final int CODE_UNAUTHORIZED = 401; //认证失败
    public static final int CODE_WECHAT_UNAUTHORIZED = 1401; //认证失败
    public static final int CODE_BUSINESS_VERIFICATION = 5010; //业务校验未通过

    public static final int ORDER_ERROR = 500; //订单调度异常

@@ -50,7 +51,7 @@
    private int records;

    // 总记录数
    private int total;
    private long total;

    //状态
    private int code;
@@ -82,6 +83,14 @@
    }

    public ResultVo(int records, int total, Object data) {
        this.code = CODE_OK;
        this.msg = MSG_OK;
        this.records = records;
        this.total = total;
        this.data = data;
    }

    public ResultVo(int records, long total, Object data) {
        this.code = CODE_OK;
        this.msg = MSG_OK;
        this.records = records;
@@ -146,7 +155,7 @@
        this.records = records;
    }

    public int getTotal() {
    public long getTotal() {
        return total;
    }