Merge remote-tracking branch 'origin/dev-v1.0' into dev-v1.0
# Conflicts: # practical-business/src/main/resources/com/platform/business/mapper/UserMapper.xml # practical-business/src/test/java/com/platform/business/mapper/UserMapperXmlTest.java
Please register or sign in to comment