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

lizijie

2021-09-16 86c06b0f6f30099b436814ab223121aa8239081a

 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;

}