bug fixed
Merge branch 'diffProcess' of https://github.com/zhongyitech/wffa.git into diffProcess