Merge origin/master 12 19添加AssetClientView