Revert "Merge branch 'sprint/182_hufangzhou_47331' into 'master'" See merge request easycorp/zentaopms!1328