fix bug
Merge branch 'master' of github.com:momoplan/mgr
Merge branch 'master' into lichenxing