Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper into master

# Conflicts:
#	fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/WeiXinCorpController.java
#	fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/Company.java
#	fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/DingDingServiceImpl.java
#	fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/UserServiceImpl.java
#	fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/CompanyMapper.xml