* finish task #1964.
 * adjust code.
Merge branch 'master' of github.com:easysoft/zentaopms