finish edit page
Merge branch 'master' of https://github.com/rexhouy/JASystem