解决widechar接口不一致
Merge branch 'development'

Conflicts:
	flashtool.v12.suo