Alawn/springboot-payment
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge

Browse Source
This commit is contained in:
xiangwb
2017-12-20 14:40:12 +08:00
parent aeafaa1b37
commit b63c54bf3e
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
boot-service/src/main/java/com/xwbing/domain/entity/sys/SysUser.java
+2 -2
View File
@@ -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;
}
boot-web/src/main/java/com/xwbing/controller/sys/SysUserControl.java
+2 -2
View File
@@ -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, "");
}