修复语法错误

修复语法错误
Merge remote-tracking branch 'origin/master'

Conflicts:
	tools_asset_info.bin