From 97f57b2ba6ffc490ccd9552dbfbdbc245973764d Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期五, 11 一月 2019 10:20:57 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

---
 gx_tieta/src/com/fgkj/actions/User_permitgroup_dataAction.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/gx_tieta/src/com/fgkj/actions/User_permitgroup_dataAction.java b/gx_tieta/src/com/fgkj/actions/User_permitgroup_dataAction.java
index 71d5a40..899f892 100644
--- a/gx_tieta/src/com/fgkj/actions/User_permitgroup_dataAction.java
+++ b/gx_tieta/src/com/fgkj/actions/User_permitgroup_dataAction.java
@@ -54,7 +54,7 @@
 		HttpSession session=ActionUtil.getSession();
 		String permits=(String) session.getAttribute("permits");
 		result=ActionUtil.tojson(permits);
-		return result;
+		return SUCCESS;
 	}
 	public String getResult() {
 		return result;

--
Gitblit v1.9.1