fix: 合并冲突

package.json

@@ -40,9 +40,13 @@
     "@ant-design/pro-components": "^2.8.9",
     "@ant-design/v5-patch-for-react-19": "^1.0.3",
     "@icon-park/react": "^1.4.2",
+    "@dnd-kit/core": "^6.3.1",
+    "@dnd-kit/sortable": "^10.0.0",
+    "@dnd-kit/utilities": "^3.2.2",
     "@tinymce/tinymce-react": "^6.3.0",
-    "antd": "^5.26.4",
+    "antd": "^5.27.3",
     "antd-style": "^3.7.0",
+    "browser-id3-writer": "^6.3.1",
     "classnames": "^2.5.1",
     "dayjs": "^1.11.13",
     "jsencrypt": "^3.5.4",
@@ -50,6 +54,7 @@
     "react": "^19.1.0",
     "react-dom": "^19.1.0",
     "react-infinite-scroll-component": "^6.1.0",
+    "react-video-thumbnail": "^0.1.3",
     "tinymce": "^8.1.2",
     "web-storage-cache": "^1.1.1"
   },