Revert "Merge branch 'sprint/175_tianshujie_17056' into 'master'" See merge request easycorp/zentaopms!783