Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev...

hdw

2019-01-19 7f953d9aa0e7d4fcbe3c366c7f9f0b3f847f12bd

 gx_tieta/src/com/fgkj/actions/User_permitgroup_dataAction.java

@@ -50,11 +50,11 @@
      return SUCCESS;

   }

    //从session中获取permits权限的属性

   public String getPermits() {

   public String FromSessiongetPermits() {

      HttpSession session=ActionUtil.getSession();

      String permits=(String) session.getAttribute("permits");

      result=ActionUtil.tojson(permits);

      return result;

      return SUCCESS;

   }

   public String getResult() {

      return result;