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

# Conflicts: # web/yarn.lock
2023-07-25 18:33:45 +08:00
parent 2b63966ee2 1ccfd619f3
commit ed0dca7346
34 changed files with 17874 additions and 4658 deletions
--- a/web/package.json
+++ b/web/package.json
@@ -49,7 +49,7 @@
 		"vue-grid-layout": "^3.0.0-beta1",
 		"vue-i18n": "^9.2.2",
 		"vue-router": "^4.1.6",
-		"vxe-table": "^4.3.10",
+		"vxe-table": "^4.4.1",
 		"xe-utils": "^3.5.7"
 	},
 	"devDependencies": {