(cherry picked commit from <gitee.com//opengauss/openGauss-OM/commit/97ad0e0cdf1c621eaaeead52018ea66163a82e85>