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

guoyujie

2025-07-14 16bbf8260110e2790f304e8421cf7591837ca302

 north-glass-erp/src/main/java/com/example/erp/service/userInfo/PermissionBasicService.java

@@ -26,7 +26,6 @@
        List<Map<String,Object>> ListOne = new ArrayList<>();

        for(PermissionBasic permissionBasic : getOne){
            System.out.println(permissionBasic.getMenu());
            Map<String,Object> map = new HashMap<>();
            map.put("value",permissionBasic.getId());
            map.put("label",permissionBasic.getMenu());