Merge remote-tracking branch 'origin/dev' into dev

pig-mesh · Aug 17, 2024 · 295c01f · 295c01f
2 parents 2264bda + a99ee36
commit 295c01f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -14,6 +14,7 @@ yarn-error.log*
 pnpm-debug.log*
 
 # Editor directories and files
+!.idea/icon.png
 .idea
 *.suo
 *.ntvs*

diff --git a/.idea/icon.png b/.idea/icon.png
diff --git a/package.json b/package.json
@@ -17,29 +17,29 @@
 		"@wangeditor/editor": "5.1.23",
 		"@wangeditor/editor-for-vue": "5.1.12",
 		"autoprefixer": "10.4.19",
-		"axios": "1.7.2",
+		"axios": "1.7.4",
 		"china-area-data": "^5.0.1",
 		"codemirror": "5.65.17",
 		"crypto-js": "4.2.0",
 		"driver.js": "1.3.1",
 		"echarts": "5.5.1",
-		"element-plus": "2.7.7",
+		"element-plus": "2.7.8",
 		"js-cookie": "3.0.5",
 		"mitt": "3.0.1",
 		"nprogress": "0.2.0",
-		"pinia": "2.1.7",
-		"postcss": "8.4.39",
-		"qs": "6.12.3",
+		"pinia": "2.2.2",
+		"postcss": "8.4.40",
+		"qs": "6.13.0",
 		"screenfull": "6.0.2",
 		"sm-crypto": "0.3.13",
 		"sortablejs": "1.15.2",
 		"splitpanes": "3.1.5",
-		"tailwindcss": "3.4.6",
-		"vue": "3.4.33",
+		"tailwindcss": "3.4.10",
+		"vue": "3.4.37",
 		"vue-clipboard3": "2.0.0",
 		"vue-echarts": "6.7.3",
 		"vue-i18n": "9.13.1",
-		"vue-router": "4.4.0",
+		"vue-router": "4.4.3",
 		"vuedraggable": "4.1.0"
 	},
 	"devDependencies": {
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,6 +14,7 @@ yarn-error.log* @@
     pnpm-debug.log*
     # Editor directories and files
+    !.idea/icon.png
     .idea
     *.suo
     *.ntvs*
@@ Expand Down @@