设定的
Merge branch 'pr/37'

Conflicts:
	ArtSearching/userInfo/LCYUserDetailInfoViewController.m