Merge remote-tracking branch 'origin/master'

# Conflicts:
#	tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/common/service/impl/BizClinicRoomServiceImpl.java