# Conflicts: # bsoft-api/src/main/java/com/bsoft/api/controller/LoginController.java # bsoft-api/src/main/java/com/bsoft/api/controller/UserController.java # bsoft-api/src/main/java/com/bsoft/api/mapper/DicDimMapper.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/SysMenuMapper.xml # bsoft-api/src/main/resources/mapper/SysOrgMapper.xml # bsoft-api/src/main/resources/mapper/SysRoleMapper.xml # bsoft-api/src/main/resources/mapper/SysUserMapper.xml
