单选，多选，判断，集成完毕
Merge branch 'develop' of github.com:mindpin/eshare into develop