解决方案配置
Merge remote-tracking branch 'origin/diffProcess'