Merge remote-tracking branch 'origin/master'

feige

2024-08-25 7070ffa6b493e75f79fe802dfc047ba3869d7b08

 zhang-content/src/main/java/com/ruoyi/domain/sysUserAndUserInfo.java

@@ -72,4 +72,7 @@

    private Long mid;
    private Long sysId;


    private Integer clanId;
}