1、项目整合

package.json

@@ -1,5 +1,4 @@
 {
-<<<<<<< HEAD
   "name": "jurs-zun",
   "description": "Vue3 + Vite + TypeScript + Element-Plus 的后台管理模板，vue-element-admin 的 Vue3 版本",
   "version": "3.4.2",
@@ -125,27 +124,5 @@
     "node": "^20.19.0 || >=22.12.0"
   },
   "repository": "https://gitee.com/youlaiorg/vue3-element-admin.git",
-  "author": "有来开源组织",
   "license": "MIT"
-=======
-  "name": "vue3-element-admin",
-  "version": "0.0.0",
-  "scripts": {
-    "dev": "vite",
-    "build": "vue-tsc --noEmit && vite build",
-    "serve": "vite preview"
-  },
-  "dependencies": {
-    "element-plus": "^1.2.0-beta.3",
-    "vue": "^3.2.16",
-    "vue-router": "^4.0.12",
-    "vuex": "^4.0.2"
-  },
-  "devDependencies": {
-    "@vitejs/plugin-vue": "^1.9.3",
-    "typescript": "^4.4.3",
-    "vite": "^2.6.4",
-    "vue-tsc": "^0.3.0"
-  }
->>>>>>> 232db255 ('首次提交')
 }