fix bug
Merge branch 'beta_version2' of github.com:1haoting/beta into beta_version2
fix bugs 2
Merge branch 'beta_version2' of github.com:1haoting/beta into beta_version2
增加4张导航图