Merge remote-tracking branch 'origin/master'

廖井涛

2025-08-25 fec9f42e00f2df68a2a20cbf132b17bdeed8e63a

 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);
}