# Conflicts:
#	bsoft-api/src/main/java/com/bsoft/api/mapper/DicDimMapper.java
#	bsoft-api/src/main/java/com/bsoft/api/mapper/DicIndMapper.java
#	bsoft-api/src/main/java/com/bsoft/api/mapper/DicOrgMapper.java
#	bsoft-api/src/main/java/com/bsoft/api/mapper/SerBlockMapper.java
#	bsoft-api/src/main/java/com/bsoft/api/mapper/SerPageBlockRsMapper.java
#	bsoft-api/src/main/java/com/bsoft/api/mapper/SerPageDimRsMapper.java
#	bsoft-api/src/main/java/com/bsoft/api/mapper/SerPageMapper.java
#	bsoft-api/src/main/java/com/bsoft/api/mapper/SysMenuMapper.java
#	bsoft-api/src/main/java/com/bsoft/api/mapper/SysOrgMapper.java
#	bsoft-api/src/main/java/com/bsoft/api/mapper/SysProjectMapper.java
#	bsoft-api/src/main/java/com/bsoft/api/mapper/SysRoleMapper.java
#	bsoft-api/src/main/java/com/bsoft/api/mapper/SysRoleMenuRsMapper.java
#	bsoft-api/src/main/java/com/bsoft/api/mapper/SysUserMapper.java
#	bsoft-api/src/main/java/com/bsoft/api/mapper/SysUserMenuRsMapper.java
#	bsoft-api/src/main/java/com/bsoft/api/mapper/SysUserOrgRsMapper.java
#	bsoft-api/src/main/java/com/bsoft/api/mapper/SysUserRoleRsMapper.java
#	bsoft-api/src/main/java/com/bsoft/api/model/SysUser.java