update
Merge branch 'master' of https://github.com/githubk1280/admin
update
merge terry code
add literature functions
merge