diff --git a/src/share/inner_table/ob_inner_table_schema_def.py b/src/share/inner_table/ob_inner_table_schema_def.py
index cb5a269fe..c1212f730 100644
--- a/src/share/inner_table/ob_inner_table_schema_def.py
+++ b/src/share/inner_table/ob_inner_table_schema_def.py
@@ -23591,7 +23591,7 @@ def_table_schema(
 )
 
 def_table_schema(
-    owner = 'baixian.zr',
+    owner = 'guoyun.lgy',
     table_name     = 'DBA_OB_OUTLINE_CONCURRENT_HISTORY',
     table_id       = '21273',
     table_type = 'SYSTEM_VIEW',
@@ -53128,7 +53128,7 @@ def_table_schema(
 )
 
 def_table_schema(
-  owner = 'baixian.zr',
+  owner = 'guoyun.lgy',
   table_name      = 'DBA_OB_OUTLINE_CONCURRENT_HISTORY',
   name_postfix = '_ORA',
   database_id     = 'OB_ORA_SYS_DATABASE_ID',
diff --git a/src/sql/code_generator/ob_static_engine_cg.cpp b/src/sql/code_generator/ob_static_engine_cg.cpp
index 6c617a4ee..96ea6291d 100644
--- a/src/sql/code_generator/ob_static_engine_cg.cpp
+++ b/src/sql/code_generator/ob_static_engine_cg.cpp
@@ -3979,7 +3979,7 @@ int ObStaticEngineCG::generate_normal_tsc(ObLogTableScan &op, ObTableScanSpec &s
     }
     root = root->and_next_;
   }
-  // TODO @baixian.zr the above optimization is overrode by ObTscCgService::generate_tsc_ctdef before this commit
+  // TODO the above optimization is overrode by ObTscCgService::generate_tsc_ctdef before this commit
   // but after the deep copy of pre_query_range_ is removed in ObTscCgService::generate_tsc_ctdef,
   // error is returned in such sql 'set global x=y', should fix this;
   // spec.tsc_ctdef_.pre_query_range_.set_is_equal_and(is_equal_and);
diff --git a/src/sql/ob_sql.cpp b/src/sql/ob_sql.cpp
index 8d1517590..4fd2e0eab 100644
--- a/src/sql/ob_sql.cpp
+++ b/src/sql/ob_sql.cpp
@@ -1474,7 +1474,7 @@ int ObSql::handle_sql_execute(const ObString &sql,
  * params: 当前sql语句的参数列表
  * res: 直接结果集
  */
-// TODO baixian.zr/hr351303, remove is_prepare_protocol and is_dynamic_sql
+// TODO remove is_prepare_protocol and is_dynamic_sql
 int ObSql::handle_pl_execute(const ObString &sql,
                              ObSQLSessionInfo &session,
                              ParamStore &params,
@@ -3764,7 +3764,7 @@ int ObSql::execute_get_plan(ObPlanCache &plan_cache,
     ret = OB_ERR_UNEXPECTED;
     LOG_WARN("session is NULL", K(ret));
   } else if (PC_PS_MODE == pc_ctx.mode_ || PC_PL_MODE == pc_ctx.mode_) {
-    // TODO baixian.zr, change pl mode hit cache as text mode.
+    // TODO change pl mode hit cache as text mode.
     ObPsStmtId stmt_id = pc_ctx.fp_result_.pc_key_.key_id_;
     guard.init(PS_EXEC_HANDLE);
     if (OB_FAIL(plan_cache.get_ps_plan(guard, stmt_id, pc_ctx))) {
diff --git a/tools/deploy/mysql_test/test_suite/hierarchical_query/t/hierarchical_basic_mysql.test b/tools/deploy/mysql_test/test_suite/hierarchical_query/t/hierarchical_basic_mysql.test
index 640ee934a..50b4acd17 100644
--- a/tools/deploy/mysql_test/test_suite/hierarchical_query/t/hierarchical_basic_mysql.test
+++ b/tools/deploy/mysql_test/test_suite/hierarchical_query/t/hierarchical_basic_mysql.test
@@ -1,5 +1,5 @@
-#owner: baixian.zr
-#owner group: SQL3
+#owner: huangweixiang.hwx
+#owner group: SQL2
 --error 1305
 select SYS_CONNECT_BY_PATH(2,1) from dual;
 
diff --git a/tools/deploy/mysql_test/test_suite/with_clause_mysql/t/basic_mysql.test b/tools/deploy/mysql_test/test_suite/with_clause_mysql/t/basic_mysql.test
index dba72dffd..4beb4a5e0 100644
--- a/tools/deploy/mysql_test/test_suite/with_clause_mysql/t/basic_mysql.test
+++ b/tools/deploy/mysql_test/test_suite/with_clause_mysql/t/basic_mysql.test
@@ -1,4 +1,4 @@
-# owner: baixian.zr
+# owner: zhl413386
 # owner group: sql2
 # tags: optimizer
 
diff --git a/tools/deploy/mysql_test/test_suite/with_clause_mysql/t/cte_errno_mysql.test b/tools/deploy/mysql_test/test_suite/with_clause_mysql/t/cte_errno_mysql.test
index cc69e53ef..9e2fe4b00 100644
--- a/tools/deploy/mysql_test/test_suite/with_clause_mysql/t/cte_errno_mysql.test
+++ b/tools/deploy/mysql_test/test_suite/with_clause_mysql/t/cte_errno_mysql.test
@@ -1,4 +1,4 @@
-# owner: baixian.zr
+# owner: zhl413386
 # owner group: sql2
 # tags: optimizer
 
diff --git a/tools/deploy/mysql_test/test_suite/with_clause_mysql/t/cte_mysql_official.test b/tools/deploy/mysql_test/test_suite/with_clause_mysql/t/cte_mysql_official.test
index 60653dbe9..5b0278de0 100644
--- a/tools/deploy/mysql_test/test_suite/with_clause_mysql/t/cte_mysql_official.test
+++ b/tools/deploy/mysql_test/test_suite/with_clause_mysql/t/cte_mysql_official.test
@@ -1,4 +1,4 @@
-# owner: baixian.zr
+# owner: zhl413386
 # owner group: sql2
 # tags: optimizer
 
diff --git a/tools/deploy/mysql_test/test_suite/with_clause_mysql/t/cte_without_explain_2_mysql.test b/tools/deploy/mysql_test/test_suite/with_clause_mysql/t/cte_without_explain_2_mysql.test
index 0645a3328..24406c60e 100644
--- a/tools/deploy/mysql_test/test_suite/with_clause_mysql/t/cte_without_explain_2_mysql.test
+++ b/tools/deploy/mysql_test/test_suite/with_clause_mysql/t/cte_without_explain_2_mysql.test
@@ -1,4 +1,4 @@
-# owner: baixian.zr
+# owner: zhl413386
 --echo # owner group: sql2
 --echo # tags: optimizer
 
diff --git a/tools/deploy/mysql_test/test_suite/with_clause_mysql/t/cte_without_explain_mysql.test b/tools/deploy/mysql_test/test_suite/with_clause_mysql/t/cte_without_explain_mysql.test
index bbbe9dd1d..2562240f1 100644
--- a/tools/deploy/mysql_test/test_suite/with_clause_mysql/t/cte_without_explain_mysql.test
+++ b/tools/deploy/mysql_test/test_suite/with_clause_mysql/t/cte_without_explain_mysql.test
@@ -1,4 +1,4 @@
-# owner: baixian.zr
+# owner: zhl413386
 --echo # owner group: sql2
 --echo # tags: optimizer
 
diff --git a/tools/deploy/mysql_test/test_suite/with_clause_mysql/t/dis_recursive_mysql.test b/tools/deploy/mysql_test/test_suite/with_clause_mysql/t/dis_recursive_mysql.test
index 6d0d2157f..d609e426c 100644
--- a/tools/deploy/mysql_test/test_suite/with_clause_mysql/t/dis_recursive_mysql.test
+++ b/tools/deploy/mysql_test/test_suite/with_clause_mysql/t/dis_recursive_mysql.test
@@ -1,4 +1,4 @@
-# owner: baixian.zr
+# owner: zhl413386
 # owner group: sql2
 # tags: optimizer
 
diff --git a/tools/deploy/mysql_test/test_suite/with_clause_mysql/t/recursive_cycle_mysql.test b/tools/deploy/mysql_test/test_suite/with_clause_mysql/t/recursive_cycle_mysql.test
index b5021748f..3552ec70a 100644
--- a/tools/deploy/mysql_test/test_suite/with_clause_mysql/t/recursive_cycle_mysql.test
+++ b/tools/deploy/mysql_test/test_suite/with_clause_mysql/t/recursive_cycle_mysql.test
@@ -1,4 +1,4 @@
-# owner: baixian.zr
+# owner: zhl413386
 # owner group: sql2
 # tags: optimizer
 
diff --git a/tools/deploy/mysql_test/test_suite/with_clause_mysql/t/recursive_join_mysql.test b/tools/deploy/mysql_test/test_suite/with_clause_mysql/t/recursive_join_mysql.test
index 01b0c6e3c..a223a0a2c 100644
--- a/tools/deploy/mysql_test/test_suite/with_clause_mysql/t/recursive_join_mysql.test
+++ b/tools/deploy/mysql_test/test_suite/with_clause_mysql/t/recursive_join_mysql.test
@@ -1,4 +1,4 @@
-# owner: baixian.zr
+# owner: zhl413386
 # owner group: sql2
 # tags: optimizer
 
diff --git a/tools/deploy/mysql_test/test_suite/with_clause_mysql/t/recursive_mysql.test b/tools/deploy/mysql_test/test_suite/with_clause_mysql/t/recursive_mysql.test
index d124f917b..9039acc35 100644
--- a/tools/deploy/mysql_test/test_suite/with_clause_mysql/t/recursive_mysql.test
+++ b/tools/deploy/mysql_test/test_suite/with_clause_mysql/t/recursive_mysql.test
@@ -1,4 +1,4 @@
-# owner: baixian.zr
+# owner: zhl413386
 # owner group: sql2
 # tags: optimizer
 
diff --git a/tools/deploy/mysql_test/test_suite/with_clause_mysql/t/recursive_optimize_mysql.test b/tools/deploy/mysql_test/test_suite/with_clause_mysql/t/recursive_optimize_mysql.test
index 6797d78fa..94356308f 100644
--- a/tools/deploy/mysql_test/test_suite/with_clause_mysql/t/recursive_optimize_mysql.test
+++ b/tools/deploy/mysql_test/test_suite/with_clause_mysql/t/recursive_optimize_mysql.test
@@ -1,4 +1,4 @@
-# owner: baixian.zr
+# owner: zhl413386
 # owner group: sql2
 # tags: optimizer