Merge branch 'master' of /Users/zhangjingyuan/Desktop/dongtaoy_oa with conflicts.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
init.d