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

kaiyu

2021-03-18 333065f8d9b599b048668a0686ba2ee58944b0e4

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

@@ -7,11 +7,13 @@

import java.io.Serializable;
import java.util.Date;
import java.util.List;
import java.util.Set;

import lombok.Data;
import lombok.EqualsAndHashCode;

import javax.persistence.Transient;


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

    @Transient
    private Organization organization;

    @Transient
    private List<Group> groups;


    @Override
    protected Serializable pkVal() {