Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into feature/iot

# Conflicts: # src/api/system/dept/index.ts
2025-08-02 10:54:08 +08:00
parent 11e78b78a7 aa8b7494e2
commit a269c5988a
131 changed files with 2709 additions and 2434 deletions
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "yudao-ui-admin-vue3",
-  "version": "2.6.0-snapshot",
+  "version": "2025.08-snapshot",
  "description": "基于vue3、vite4、element-plus、typesScript",
  "author": "xingyu",
  "private": false,