# Conflicts: # src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml # src/main/resources/props/config_local.properties