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

kaiyu

2021-03-12 37d76adf129d41f65342874886c43db450ecb0ef

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

@@ -95,13 +95,6 @@
    private String isDelete;


    @TableField(exist = false)
    private Set<Group> groups;

    @TableField(exist = false)
    private Set<Menu> menus;


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