null
Merge branch 'xiao' into dev
add a action which can get pictInfo list
update the pushmanager,getPushList
Merge branch 'dev' of github.com:xhy940801/Discovery into dev
Merge branch 'xiao' of github.com:xhy940801/Discovery into xiao
null