fix some bug uodatedj
Merge branch 'develop' of https://github.com/where2night/server into develop