修改

package-lock.json

@@ -14,14 +14,10 @@
         "@wangeditor/editor": "^5.1.23",
         "@wangeditor/editor-for-vue": "5.1.10",
         "axios": "^1.6.7",
-<<<<<<< HEAD
         "echarts": "^5.5.0",
-        "element-plus": "^2.5.6",
-=======
         "crypto-js": "^4.2.0",
         "element-plus": "^2.5.6",
         "jsencrypt": "^3.3.2",
->>>>>>> 5f88fd1667661a41787fe8f1593b52a5337e7d3f
         "lodash-es": "^4.17.21",
         "moment": "^2.30.1",
         "nprogress": "^0.2.0",

package.json

@@ -17,11 +17,8 @@
     "@wangeditor/editor": "^5.1.23",
     "@wangeditor/editor-for-vue": "5.1.10",
     "axios": "^1.6.7",
-<<<<<<< HEAD
     "echarts": "^5.5.0",
-=======
     "crypto-js": "^4.2.0",
->>>>>>> 5f88fd1667661a41787fe8f1593b52a5337e7d3f
     "element-plus": "^2.5.6",
     "jsencrypt": "^3.3.2",
     "lodash-es": "^4.17.21",