# Conflicts:
#	custom-server-app/src/main/java/com/jomalls/custom/app/service/SysUserService.java
#	custom-server-app/src/main/java/com/jomalls/custom/app/service/impl/SysUserServiceImpl.java
#	custom-server-app/src/main/java/com/jomalls/custom/app/vo/SysMenuVo.java
#	custom-server-app/src/main/java/com/jomalls/custom/app/vo/SysRoleDeptPageVO.java
#	custom-server-app/src/main/java/com/jomalls/custom/app/vo/SysRoleDeptVO.java
#	custom-server-app/src/main/java/com/jomalls/custom/app/vo/SysRoleMenuPageVO.java
#	custom-server-app/src/main/java/com/jomalls/custom/app/vo/SysRoleMenuVO.java
#	custom-server-app/src/main/java/com/jomalls/custom/app/vo/SysRolePageVO.java
#	custom-server-app/src/main/java/com/jomalls/custom/app/vo/SysRoleVO.java
#	custom-server-app/src/main/java/com/jomalls/custom/app/vo/SysUserOldPageVO.java
#	custom-server-app/src/main/java/com/jomalls/custom/app/vo/SysUserOldVO.java
#	custom-server-app/src/main/java/com/jomalls/custom/app/vo/SysUserRolePageVO.java
#	custom-server-app/src/main/java/com/jomalls/custom/app/vo/SysUserRoleVO.java
#	custom-server-webapp/src/main/java/com/jomalls/custom/webapp/controller/SysUserController.java