注释avatar
Merge remote-tracking branch 'origin/dev' into liuxc
Merge branch 'dev' of https://github.com/XimenTech/SHTP into dev