增加一个字典类
Merge remote-tracking branch 'origin/master'