Merge remote-tracking branch 'origin/master'

yn147

2023-04-12 f0f58829c5c8dd9b249f594526f01fa957cbdd59

 src/main/java/com/qxueyou/scc/user/model/User.java

@@ -144,6 +144,20 @@
    @Column(name = "IMEI", length = 255)
    private String imei;

    /**
     * 绑定账号ID
     */
    @Column(name = "OPENID", length = 255)
    private String openId;

    public String getOpenId() {
        return openId;
    }

    public void setOpenId(String openId) {
        this.openId = openId;
    }

    @ManyToMany(fetch = FetchType.LAZY, mappedBy = "users")
    @JsonIgnore
    private List<UserRole> roles;