* finish task #2003.
Merge branch 'master' of github.com:easysoft/zentaopms
 * finish task #2050.
Merge branch 'master' of github.com:easysoft/zentaopms