Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev

kaiyu

2021-03-18 1ec0374d08be45c6c6854705211dbd6c067dfab7

 screen-api/src/main/java/com/moral/api/entity/User.java

@@ -96,13 +96,6 @@
     */
    private String isDelete;

    @Transient
    private Organization organization;

    @Transient
    private List<Group> groups;


    @Override
    protected Serializable pkVal() {
        return this.id;