# Conflicts: # practical-business/src/main/resources/com/platform/business/mapper/UserMapper.xml # practical-business/src/test/java/com/platform/business/mapper/UserMapperXmlTest.java