From 153b891aea3fab7528d497e2ededf294fa016c3a Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Sun, 24 Dec 2017 21:51:38 +0800
Subject: [PATCH] Merge branch 'master' of ssh://blit.7drlb.com:29418/screen_api_v2

---
 src/main/java/com/moral/common/bean/ResultBean.java |   28 ++++++++++++++++------------
 1 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/moral/common/bean/ResultBean.java b/src/main/java/com/moral/common/bean/ResultBean.java
index 6506493..96ad875 100644
--- a/src/main/java/com/moral/common/bean/ResultBean.java
+++ b/src/main/java/com/moral/common/bean/ResultBean.java
@@ -12,29 +12,33 @@
 	public static final int FAIL = 0;
 	public static final int SUCCESS = 1;
 	public static final int NO_PERMISSION = 2;
-	private String msg = "success";
+	private String message = "success";
 	private int code = SUCCESS;
 	private T data;
+
 	public ResultBean() {
 		super();
 	}
+
+	public ResultBean(int code) {
+		super();
+		this.code = code;
+	}
+
+	public ResultBean(Throwable e) {
+		super();
+		this.message = e.toString();
+		this.code = FAIL;
+	}
+
 	public ResultBean(T data) {
 		super();
 		this.data = data;
 	}
 	
-	public ResultBean(Throwable e) {
+	public ResultBean(String message, int code) {
 		super();
-		this.msg = e.toString();
-		this.code = FAIL;
-	}
-	public ResultBean(String msg, int code) {
-		super();
-		this.msg = msg;
-		this.code = code;
-	}
-	public ResultBean(int code) {
-		super();
+		this.message = message;
 		this.code = code;
 	}
 }

--
Gitblit v1.8.0