From 6b6f3fbd333894209e0df1822ff89881aa4319fe Mon Sep 17 00:00:00 2001
From: 于杰 <1210123631@qq.com>
Date: 星期五, 29 八月 2025 14:30:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 north-glass-erp/src/main/java/com/example/erp/mapper/userInfo/PermissionRoleMapper.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/userInfo/PermissionRoleMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/userInfo/PermissionRoleMapper.java
index 73b3ece..e9dca04 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/userInfo/PermissionRoleMapper.java
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/userInfo/PermissionRoleMapper.java
@@ -11,4 +11,6 @@
     List<String> getUserPermission(Integer loginId);
 
     Boolean saveBatch(List<PermissionRole> permissionRoles);
+
+    List<String> getUserEditPermission(Integer loginId, Boolean userIsAdmin);
 }

--
Gitblit v1.8.0