From cdd5fe1813e63adcddd61581cb886b9d154e5a3c Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.31.211>
Date: 星期三, 16 一月 2019 19:19:38 +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