Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

guoyuji

2024-10-30 f2b7487e3722ce3218a8e23a6ac18c1b78fe6a2c

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