Merge branch 'develop' of http://git.ycjcjy.com/fuxingfan/smartCommunity into develop
# 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