# Conflicts: # CODE/smart-community/property-api/src/main/java/com/community/huiju/common/base/BaseController.java # 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/service/IBuildingOwnerInfoService.java # CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/BuildingOwnerInfoServiceImpl.java
开发分支,不断迭代