From 3df4f24049c8b3e4c36fde16a67a436ce37f00ad Mon Sep 17 00:00:00 2001
From: JinPengYong <812110275@qq.com>
Date: Sun, 26 Apr 2020 16:18:30 +0800
Subject: [PATCH] Merge branch 'master' of F:\moral\moral\screen_api_v2 with conflicts.
---
src/main/java/com/moral/common/bean/ResultBean.java | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/moral/common/bean/ResultBean.java b/src/main/java/com/moral/common/bean/ResultBean.java
index e0c2d60..848cf76 100644
--- a/src/main/java/com/moral/common/bean/ResultBean.java
+++ b/src/main/java/com/moral/common/bean/ResultBean.java
@@ -14,6 +14,7 @@
public static final int NO_PERMISSION = 2;
private String message;
private Integer code;
+ private Integer errno;
private T data;
public ResultBean() {
@@ -30,12 +31,14 @@
public ResultBean(Throwable e) {
this.message = e.toString();
this.code = FAIL;
+ this.errno = 1;
}
public ResultBean(T data) {
this.message = "success";
this.code = SUCCESS;
this.data = data;
+ this.errno = 0;
}
public ResultBean(String message, int code) {
--
Gitblit v1.8.0