分类添加方法修改提交
Merge remote-tracking branch 're/master'