Authored by 王涛

Merge branch 'master-500-dev-lushangqing' into 'master-500-dev'

【无】收藏夹图片更换



See merge request !934