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

cjl

2023-11-07 54beb665319b66742cdec3dffb7e298701d61582

 screen-api/src/main/java/com/moral/api/service/OrganizationService.java

@@ -33,4 +33,7 @@
            */
    Organization getOrganizationById(Integer id);




}