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

cjl

2023-08-23 ecff6c40a1728c61c6a9a713df721b0eb31a616c

 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;

}