元数据结构大调整
Merge remote-tracking branch 'toGitHub/master'