增加zmc类内容
Merge origin/develop into develop