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/AppData.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/moral/common/bean/AppData.java b/src/main/java/com/moral/common/bean/AppData.java
index a1d12d0..a35fa42 100644
--- a/src/main/java/com/moral/common/bean/AppData.java
+++ b/src/main/java/com/moral/common/bean/AppData.java
@@ -12,7 +12,7 @@
 	public static final int SUCCESS = 0;
 	public static final int FAIL = 1;
 	public static final int NO_PERMISSION = 2;
-	private String message = "success";
+	private String message = "������";
 	private int errno = SUCCESS;
 	private T data;
 

--
Gitblit v1.8.0