From b63c54bf3e7a4fb1f2ce9892933146eed0d20ab5 Mon Sep 17 00:00:00 2001
From: xiangwb <xiangwb@drore.com>
Date: Wed, 20 Dec 2017 14:40:12 +0800
Subject: [PATCH] merge

---
 .../src/main/java/com/xwbing/domain/entity/sys/SysUser.java   | 4 ++--
 .../main/java/com/xwbing/controller/sys/SysUserControl.java   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/boot-service/src/main/java/com/xwbing/domain/entity/sys/SysUser.java b/boot-service/src/main/java/com/xwbing/domain/entity/sys/SysUser.java
index 6c0e68e..2979dbc 100644
--- a/boot-service/src/main/java/com/xwbing/domain/entity/sys/SysUser.java
+++ b/boot-service/src/main/java/com/xwbing/domain/entity/sys/SysUser.java
@@ -57,7 +57,7 @@ public class SysUser extends BaseEntity {
     @ApiModelProperty(hidden = true)
     private transient String sexName;
     @ApiModelProperty(hidden = true)
-    private transient List<SysAuthority> menuArray;
+    private transient List<SysAuthority> menus;
     @ApiModelProperty(hidden = true)
-    private transient List<SysAuthority> buttonArray;
+    private transient List<SysAuthority> buttons;
 }
diff --git a/boot-web/src/main/java/com/xwbing/controller/sys/SysUserControl.java b/boot-web/src/main/java/com/xwbing/controller/sys/SysUserControl.java
index 621fdc7..889df4f 100644
--- a/boot-web/src/main/java/com/xwbing/controller/sys/SysUserControl.java
+++ b/boot-web/src/main/java/com/xwbing/controller/sys/SysUserControl.java
@@ -160,8 +160,8 @@ public class SysUserControl {
                     button.add(sysAuthority);
             }
         }
-        sysUser.setMenuArray(menu);
-        sysUser.setButtonArray(button);
+        sysUser.setMenus(menu);
+        sysUser.setButtons(button);
         return JSONObjResult.toJSONObj(sysUser, true, "");
     }