From 16a49a854088ce8684597b087ad6a39f94c6a94d Mon Sep 17 00:00:00 2001 From: zuohuaijun Date: Sun, 23 Mar 2025 14:40:53 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=98=8E=E5=8D=87=E7=BA=A7=E4=BE=9D?= =?UTF-8?q?=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj | 6 +++--- .../Admin.NET.Core/Service/User/SysUserRoleService.cs | 3 +-- .../Admin.NET.Plugin.PaddleOCR.csproj | 2 +- Web/package.json | 10 +++++----- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj b/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj index fcc850ee..fb60b6f8 100644 --- a/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj +++ b/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj @@ -28,9 +28,9 @@ - - - + + + diff --git a/Admin.NET/Admin.NET.Core/Service/User/SysUserRoleService.cs b/Admin.NET/Admin.NET.Core/Service/User/SysUserRoleService.cs index f998a7ec..c2216355 100644 --- a/Admin.NET/Admin.NET.Core/Service/User/SysUserRoleService.cs +++ b/Admin.NET/Admin.NET.Core/Service/User/SysUserRoleService.cs @@ -106,8 +106,7 @@ public class SysUserRoleService : ITransient /// public async Task> GetUserRoleList(long userId) { - var sysUserRoleList = await _sysUserRoleRep.AsQueryable() - .Includes(u => u.SysRole) + var sysUserRoleList = await _sysUserRoleRep.AsQueryable().Includes(u => u.SysRole) .Where(u => u.UserId == userId).ToListAsync(); return sysUserRoleList.Where(u => u.SysRole != null).Select(u => u.SysRole).ToList(); } diff --git a/Admin.NET/Plugins/Admin.NET.Plugin.PaddleOCR/Admin.NET.Plugin.PaddleOCR.csproj b/Admin.NET/Plugins/Admin.NET.Plugin.PaddleOCR/Admin.NET.Plugin.PaddleOCR.csproj index bd8ad563..2a1ffe0a 100644 --- a/Admin.NET/Plugins/Admin.NET.Plugin.PaddleOCR/Admin.NET.Plugin.PaddleOCR.csproj +++ b/Admin.NET/Plugins/Admin.NET.Plugin.PaddleOCR/Admin.NET.Plugin.PaddleOCR.csproj @@ -31,7 +31,7 @@ - + diff --git a/Web/package.json b/Web/package.json index 3fe1c6dd..00dd4ab0 100644 --- a/Web/package.json +++ b/Web/package.json @@ -2,7 +2,7 @@ "name": "admin.net.pro", "type": "module", "version": "2.4.33", - "lastBuildTime": "2025.03.21", + "lastBuildTime": "2025.03.23", "description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架", "author": "zuohuaijun", "license": "MIT", @@ -46,7 +46,7 @@ "jsplumb": "^2.15.6", "jwchat": "^2.0.3", "lodash-es": "^4.17.21", - "md-editor-v3": "^5.4.3", + "md-editor-v3": "^5.4.4", "mitt": "^3.0.1", "monaco-editor": "^0.52.2", "mqtt": "^5.10.4", @@ -76,7 +76,7 @@ "vue-signature-pad": "^3.0.2", "vue3-flag-icons": "^0.0.3", "vue3-tree-org": "^4.2.2", - "vxe-pc-ui": "^4.4.21", + "vxe-pc-ui": "^4.4.22", "vxe-table": "^4.11.28", "vxe-table-plugin-element": "^4.0.4", "vxe-table-plugin-export-xlsx": "^4.0.7", @@ -87,7 +87,7 @@ "@iconify/vue": "^4.3.0", "@plugin-web-update-notification/vite": "^2.0.0", "@types/lodash-es": "^4.17.12", - "@types/node": "^20.17.24", + "@types/node": "^20.17.25", "@types/nprogress": "^0.2.3", "@types/sortablejs": "^1.15.8", "@typescript-eslint/eslint-plugin": "^8.27.0", @@ -96,7 +96,7 @@ "@vitejs/plugin-vue-jsx": "^4.1.2", "@vue/compiler-sfc": "^3.5.13", "code-inspector-plugin": "^0.20.6", - "eslint": "^9.22.0", + "eslint": "^9.23.0", "eslint-plugin-vue": "^10.0.0", "globals": "^16.0.0", "less": "^4.2.2",