Signed-off-by: ghuazh <ghuazh@gmail.com>
Merge branch 'master' of https://github.com/sgewuhan/pm.git

Conflicts:
	com.tmt.jszx/src/com/tmt/jszx/field/processparameterdelegator/DeputyDirector.java
	com.tmt.jszx/src/com/tmt/jszx/field/processparameterdelegator/ProjectAdmin.java

Signed-off-by: ghuazh <ghuazh@gmail.com>