解决方案修改
Merge remote-tracking branch 'origin/diffProcess'