fix 2.9 classes and structures
resolve 2.12 conflict
resolve all conflict
Merge pull request #185 from stanzhai/develop

【校对】审查完所有文档，确保没有冲突