(cherry picked commit from <gitee.com//opengauss/openGauss-OM/commit/74651b04ac6dacfd6b9dab3d7c03cf3db30ba31d>