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

cjl

2023-11-08 5c1d58556e9cd4c7603b5e16dc1640f61623af0b

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