From a86aed1d459024ab2a97d98115ef57f8dce808e6 Mon Sep 17 00:00:00 2001
From: admin:huo123456@qq <496960745@qq.com>
Date: 星期一, 21 一月 2019 09:15:44 +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 899f892..c526419 100644
--- a/gx_tieta/src/com/fgkj/actions/User_permitgroup_dataAction.java
+++ b/gx_tieta/src/com/fgkj/actions/User_permitgroup_dataAction.java
@@ -50,7 +50,7 @@
 		return SUCCESS;
 	}
     //浠巗ession涓幏鍙杙ermits鏉冮檺鐨勫睘鎬�
-	public String getPermits() {
+	public String FromSessiongetPermits() {
 		HttpSession session=ActionUtil.getSession();
 		String permits=(String) session.getAttribute("permits");
 		result=ActionUtil.tojson(permits);

--
Gitblit v1.9.1