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

cjl

2023-07-21 1393ec7b94738419acbfd340cf24d3debaa2b73e

 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;

}