diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index cef82635..545719ff 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -131,7 +131,7 @@ importers:
     dependencies:
       '@tinymce/tinymce-vue':
         specifier: ^6.0.1
-        version: 6.0.1(vue@3.5.0(typescript@5.5.4))
+        version: 6.0.1(vue@3.5.2(typescript@5.5.4))
       '@vben/access':
         specifier: workspace:*
         version: link:../../packages/effects/access
@@ -179,17 +179,13 @@ importers:
         version: 11.0.3(vue@3.5.2(typescript@5.5.4))
       ant-design-vue:
         specifier: ^4.2.3
-<<<<<<< HEAD
-        version: 4.2.3(vue@3.5.0(typescript@5.5.4))
+        version: 4.2.3(vue@3.5.2(typescript@5.5.4))
       cropperjs:
         specifier: ^1.6.2
         version: 1.6.2
       crypto-js:
         specifier: ^4.2.0
         version: 4.2.0
-=======
-        version: 4.2.3(vue@3.5.2(typescript@5.5.4))
->>>>>>> 1cff0b9753d1424ee8da1703b2b9caae366cb29b
       dayjs:
         specifier: ^1.11.13
         version: 1.11.13
@@ -204,21 +200,16 @@ importers:
         version: 4.17.21
       pinia:
         specifier: 2.2.2
-<<<<<<< HEAD
-        version: 2.2.2(typescript@5.5.4)(vue@3.5.0(typescript@5.5.4))
+        version: 2.2.2(typescript@5.5.4)(vue@3.5.2(typescript@5.5.4))
       tinymce:
         specifier: ^7.3.0
         version: 7.3.0
-=======
-        version: 2.2.2(typescript@5.5.4)(vue@3.5.2(typescript@5.5.4))
->>>>>>> 1cff0b9753d1424ee8da1703b2b9caae366cb29b
       vue:
         specifier: 3.5.2
         version: 3.5.2(typescript@5.5.4)
       vue-router:
         specifier: ^4.4.3
-<<<<<<< HEAD
-        version: 4.4.3(vue@3.5.0(typescript@5.5.4))
+        version: 4.4.3(vue@3.5.2(typescript@5.5.4))
     devDependencies:
       '@types/crypto-js':
         specifier: ^4.2.2
@@ -228,10 +219,7 @@ importers:
         version: 4.17.12
       unplugin-vue-components:
         specifier: ^0.27.3
-        version: 0.27.4(@babel/parser@7.25.6)(rollup@4.21.2)(vue@3.5.0(typescript@5.5.4))
-=======
-        version: 4.4.3(vue@3.5.2(typescript@5.5.4))
->>>>>>> 1cff0b9753d1424ee8da1703b2b9caae366cb29b
+        version: 0.27.4(@babel/parser@7.25.6)(rollup@4.21.2)(vue@3.5.2(typescript@5.5.4))
 
   apps/web-ele:
     dependencies:
@@ -4037,7 +4025,7 @@ packages:
   '@tanstack/vue-virtual@3.10.1':
     resolution: {integrity: sha512-K4WFHK0RpQpJvV6osI8qDrFJjMbsfWFptbyxOXJu5yEpEMP7C14e5hFgMINlKc3yK1BvFrtKedc0qM4UV+oOkg==}
     peerDependencies:
-      vue: 3.5.0
+      vue: 3.5.2
 
   '@tinymce/tinymce-vue@6.0.1':
     resolution: {integrity: sha512-VzjI8AKlNrrsosIk3WuBez6kubqPsPMeaButkRLuts77uo4e2EwPRFX+VyB6fHbMGHwUPK22zNjOUGMvJFZFCw==}
@@ -9466,7 +9454,7 @@ packages:
     peerDependencies:
       '@babel/parser': ^7.15.8
       '@nuxt/kit': ^3.2.2
-      vue: 3.5.0
+      vue: 3.5.2
     peerDependenciesMeta:
       '@babel/parser':
         optional: true
@@ -12995,22 +12983,15 @@ snapshots:
       vue: 3.5.2(typescript@5.5.4)
       vue-demi: 0.14.10(vue@3.5.2(typescript@5.5.4))
 
-<<<<<<< HEAD
-  '@tanstack/vue-virtual@3.10.1(vue@3.5.0(typescript@5.5.4))':
+  '@tanstack/vue-virtual@3.10.1(vue@3.5.2(typescript@5.5.4))':
     dependencies:
       '@tanstack/virtual-core': 3.10.1
-      vue: 3.5.0(typescript@5.5.4)
+      vue: 3.5.2(typescript@5.5.4)
 
-  '@tinymce/tinymce-vue@6.0.1(vue@3.5.0(typescript@5.5.4))':
+  '@tinymce/tinymce-vue@6.0.1(vue@3.5.2(typescript@5.5.4))':
     dependencies:
       tinymce: 7.3.0
-      vue: 3.5.0(typescript@5.5.4)
-=======
-  '@tanstack/vue-virtual@3.9.0(vue@3.5.2(typescript@5.5.4))':
-    dependencies:
-      '@tanstack/virtual-core': 3.9.0
       vue: 3.5.2(typescript@5.5.4)
->>>>>>> 1cff0b9753d1424ee8da1703b2b9caae366cb29b
 
   '@tootallnate/once@1.1.2': {}
 
@@ -17887,15 +17868,9 @@ snapshots:
       '@floating-ui/vue': 1.1.4(vue@3.5.2(typescript@5.5.4))
       '@internationalized/date': 3.5.5
       '@internationalized/number': 3.5.3
-<<<<<<< HEAD
-      '@tanstack/vue-virtual': 3.10.1(vue@3.5.0(typescript@5.5.4))
-      '@vueuse/core': 10.11.1(vue@3.5.0(typescript@5.5.4))
-      '@vueuse/shared': 10.11.1(vue@3.5.0(typescript@5.5.4))
-=======
-      '@tanstack/vue-virtual': 3.9.0(vue@3.5.2(typescript@5.5.4))
+      '@tanstack/vue-virtual': 3.10.1(vue@3.5.2(typescript@5.5.4))
       '@vueuse/core': 10.11.1(vue@3.5.2(typescript@5.5.4))
       '@vueuse/shared': 10.11.1(vue@3.5.2(typescript@5.5.4))
->>>>>>> 1cff0b9753d1424ee8da1703b2b9caae366cb29b
       aria-hidden: 1.2.4
       defu: 6.1.4
       fast-deep-equal: 3.1.3
@@ -19125,7 +19100,7 @@ snapshots:
     transitivePeerDependencies:
       - rollup
 
-  unplugin-vue-components@0.27.4(@babel/parser@7.25.6)(rollup@4.21.2)(vue@3.5.0(typescript@5.5.4)):
+  unplugin-vue-components@0.27.4(@babel/parser@7.25.6)(rollup@4.21.2)(vue@3.5.2(typescript@5.5.4)):
     dependencies:
       '@antfu/utils': 0.7.10
       '@rollup/pluginutils': 5.1.0(rollup@4.21.2)
@@ -19137,7 +19112,7 @@ snapshots:
       minimatch: 9.0.5
       mlly: 1.7.1
       unplugin: 1.12.2
-      vue: 3.5.0(typescript@5.5.4)
+      vue: 3.5.2(typescript@5.5.4)
     optionalDependencies:
       '@babel/parser': 7.25.6
     transitivePeerDependencies: