modify the jsp
fix comfict
Merge pull request #441 from youyong205/master

refactor