Merge remote-tracking branch 'origin/dev' into cjl

cjl

2024-03-28 33b9d2c203a9998272088ecdf43a15dd53669967

 screen-api/src/main/java/com/moral/api/controller/OrganizationController.java

@@ -86,4 +86,12 @@
        List<Organization> organizations = organizationService.getOrganizationId();
        return ResultMessage.ok(ObjectUtils.isEmpty(organizations)?"0":organizations);
    }


    @GetMapping("queryDevices")
    @ApiOperation("查询组织信息")
    public  ResultMessage queryDevices(){
        List<Organization> organizations = organizationService.queryDevices();
        return ResultMessage.ok(organizations);
    }
}