Commit 1451f632c4212963ba9cc61d3c05b8598aeb8b03

Authored by 刘琴
2 parents 313c86e0 4b03fc7b

Merge branch 'master' of http://120.78.57.84/lee/Protocol

# Conflicts:
#	通讯协议-平台化-应用部分[内部].md