# Conflicts: # src/main/java/com/huiju/estateagents/controller/TaShareChildRecordController.java # src/main/java/com/huiju/estateagents/controller/TaShareRecordController.java # src/main/java/com/huiju/estateagents/mapper/TaShareRecordMapper.java # src/main/java/com/huiju/estateagents/service/ITaShareChildRecordService.java # src/main/java/com/huiju/estateagents/service/ITaShareRecordService.java # src/main/java/com/huiju/estateagents/service/impl/TaShareChildRecordServiceImpl.java # src/main/java/com/huiju/estateagents/service/impl/TaShareRecordServiceImpl.java # src/main/resources/mapper/TaShareRecordMapper.xml