Merge branch 'master' of http://bore.pub:10439/r/ERP_override

guoyuji

2024-12-17 cfa4a3fdb3dcd9a811157c4bd8f82ba4025917bc

 north-glass-erp/src/main/java/com/example/erp/mapper/userInfo/PermissionRoleMapper.java

@@ -12,5 +12,5 @@

    Boolean saveBatch(List<PermissionRole> permissionRoles);

    List<String> getUserEditPermission(Integer loginId);
    List<String> getUserEditPermission(Integer loginId, Boolean userIsAdmin);
}