# Conflicts:
#	bsoft-api/src/main/java/com/bsoft/api/model/DicDim.java
#	bsoft-api/src/main/java/com/bsoft/api/model/DicInd.java
#	bsoft-api/src/main/java/com/bsoft/api/model/DicOrg.java
#	bsoft-api/src/main/java/com/bsoft/api/model/SerBlock.java
#	bsoft-api/src/main/java/com/bsoft/api/model/SerPage.java
#	bsoft-api/src/main/java/com/bsoft/api/model/SerPageBlockRs.java
#	bsoft-api/src/main/java/com/bsoft/api/model/SerPageDimRs.java
#	bsoft-api/src/main/java/com/bsoft/api/model/SysMenu.java
#	bsoft-api/src/main/java/com/bsoft/api/model/SysOrg.java
#	bsoft-api/src/main/java/com/bsoft/api/model/SysProject.java
#	bsoft-api/src/main/java/com/bsoft/api/model/SysRole.java
#	bsoft-api/src/main/java/com/bsoft/api/model/SysRoleMenuRs.java
#	bsoft-api/src/main/java/com/bsoft/api/model/SysUserMenuRs.java
#	bsoft-api/src/main/java/com/bsoft/api/model/SysUserOrgRs.java
#	bsoft-api/src/main/java/com/bsoft/api/model/SysUserRoleRs.java
#	bsoft-api/src/main/resources/mapper/DicDimMapper.xml
#	bsoft-api/src/main/resources/mapper/DicIndMapper.xml
#	bsoft-api/src/main/resources/mapper/DicOrgMapper.xml
#	bsoft-api/src/main/resources/mapper/SerBlockMapper.xml
#	bsoft-api/src/main/resources/mapper/SerPageBlockRsMapper.xml
#	bsoft-api/src/main/resources/mapper/SerPageDimRsMapper.xml
#	bsoft-api/src/main/resources/mapper/SerPageMapper.xml
#	bsoft-api/src/main/resources/mapper/SysMenuMapper.xml
#	bsoft-api/src/main/resources/mapper/SysOrgMapper.xml
#	bsoft-api/src/main/resources/mapper/SysProjectMapper.xml
#	bsoft-api/src/main/resources/mapper/SysRoleMapper.xml
#	bsoft-api/src/main/resources/mapper/SysRoleMenuRsMapper.xml
#	bsoft-api/src/main/resources/mapper/SysUserMapper.xml
#	bsoft-api/src/main/resources/mapper/SysUserMenuRsMapper.xml
#	bsoft-api/src/main/resources/mapper/SysUserOrgRsMapper.xml
#	bsoft-api/src/main/resources/mapper/SysUserRoleRsMapper.xml