# Conflicts: # src/main/java/com/huiju/estateagents/mapper/TaLiveActivityMapper.java # src/main/resources/mapper/TaLiveActivityMapper.xml