# Conflicts: # CODE/smart-community/property-api/src/main/java/com/community/huiju/controller/BuildingOwnerInfoController.java # CODE/smart-community/property-api/src/main/java/com/community/huiju/dao/BuildingOwnerInfoMapper.java # CODE/smart-community/property-api/src/main/java/com/community/huiju/dao/TaUserMapper.java # CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/BuildingOwnerInfoServiceImpl.java # CODE/smart-community/property-api/src/main/resources/mapper/TaUserMapper.xml
开发分支,不断迭代