merge code
Merge branch 'dev-shz' of https://github.com/slowfall/meeting
merge develope code to master
modified something
modified http request,add login request
s
Merge branch 'master' of https://github.com/slowfall/meeting
Merge branch 'master' into dev-shz