fix js method conflict bugs
Merge branch 'master' of https://github.com/antme/pms