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

kaiyu

2021-09-14 82841afc4e140f72fdeb378102e0e9a978bbe14c

 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;

}