# Conflicts: # bsoft-api/src/main/java/com/bsoft/api/mapper/SysUserMapper.java # bsoft-api/src/main/java/com/bsoft/api/model/SysUser.java # bsoft-api/src/main/resources/mapper/SysUserMapper.xml
