1:修改格式化方式为字符串格式化
Merge remote-tracking branch 'origin/master'