From ee582a5d091966cf2324653c53a7553623e09730 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 23 九月 2019 19:19:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/controller/admin/MessageController.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/MessageController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/MessageController.java
index 74efd73..7b78cfd 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/MessageController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/MessageController.java
@@ -27,7 +27,7 @@
 
 	@RequestMapping(value = "getZhuShou")
 	public void getZhuShou(String callback, PrintWriter out) {
-		// 杩斿埄鍒稿皬鍔╂墜
+		// 鏉挎牀蹇渷灏忓姪鎵�
 		MsgCommonDTO zhuShouMsg = msgConfigService.getZhuShouMsg();
 		JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(new Gson().toJson(zhuShouMsg)));
 	}

--
Gitblit v1.8.0