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

cjl

2023-11-07 54beb665319b66742cdec3dffb7e298701d61582

 screen-api/src/main/java/com/moral/api/pojo/bo/UserBO.java

@@ -20,6 +20,6 @@
    private Organization organization;


    private List<Group> groups;
    private Group group;

}