# Conflicts: # src/main/java/com/huiju/estateagents/controller/TaShareController.java # src/main/java/com/huiju/estateagents/mapper/TaShareMapper.java # src/main/java/com/huiju/estateagents/service/ITaShareService.java # src/main/resources/mapper/TaShareMapper.xml