can add revision
Merge branch 'xiao' into dev
update the pushmanager,getPushList
Merge branch 'dev' of github.com:xhy940801/Discovery into dev