* finish task#1658.
Merge branch 'master' of git@github.com:easysoft/zentaopms
 * code for task#1514.
Merge branch 'master' of git@github.com:easysoft/zentaopms