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

cjl

2023-09-21 ff3af3a0dd0fe87a500c13e933bea1f553083508

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