Merge branch 'swiftLint-develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into swiftLint-develop

# Conflicts:
#	galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/Resign(续签)/UploadTravelCrad(上传旅行证件)/V/YHResignUploadTravelCardListfootView.swift