Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_backend

feige

5 天以前 ba97f97d28f65d2b8ed5406792aa66a9d3fc9ed8

 ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java

@@ -121,6 +121,16 @@

    private Integer clanId;

    private String uaid;

    public String getUaid() {
        return uaid;
    }

    public void setUaid(String uaid) {
        this.uaid = uaid;
    }

    public void setClanId(Integer clanId) {
        this.clanId = clanId;
    }