Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb

jinpengyong

2024-01-26 c21c161bc5ecddbe2a1d5174c2d178d768939e17

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