Merge branch 'cjl' into dev

cjl

2025-01-06 27e6bc3df3e39e0d0b147b155a89ad6837ea972b

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

@@ -33,7 +33,7 @@
        }
        Map<String,Object> resultMap = organizationLayoutService.getLayoutByMac(parameters.get("mac").toString());
        if (ObjectUtils.isEmpty(resultMap)){
            return null;
            return ResultMessage.ok();
        }
        return ResultMessage.ok(resultMap);
    }