* finish task#1594.
Merge branch 'master' of git@github.com:easysoft/zentaopms
 * finish task#1609.