chore: Merge master branch and fix conflicts

oceanbase · Sep 12, 2023 · b260f3b · b260f3b
2 parents 8f5e40a + 1e943bf
commit b260f3b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/package.json b/package.json
@@ -91,7 +91,7 @@
     "rc-checkbox": "^3.1.0",
     "rc-drawer": "^6.4.1",
     "rc-footer": "^0.6.8",
-    "rc-tabs": "^12.12.0",
+    "rc-tabs": "^12.12.1",
     "rc-util": "^5.37.0",
     "react": "^18.2.0",
     "react-color": "^2.19.3",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml