From 0417d31de9980cbc1735daffffb308d050ce35b4 Mon Sep 17 00:00:00 2001
From: wfy <260536420@qq.com>
Date: 星期六, 18 九月 2021 16:47:52 +0800
Subject: [PATCH] Merge branch 'master' into wangfy-dev
---
java110-bean/src/main/java/com/java110/vo/ResultVo.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/java110-bean/src/main/java/com/java110/vo/ResultVo.java b/java110-bean/src/main/java/com/java110/vo/ResultVo.java
index 8d4c337..663c66d 100755
--- a/java110-bean/src/main/java/com/java110/vo/ResultVo.java
+++ b/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;
}
--
Gitblit v1.8.0