Merge remote-tracking branch 'origin/master'

feige

2024-11-05 b4895bdc5d9268e55c0023b92cc7c2d68ba33e46

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

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

    private Long mid;
    private Long sysId;


    private Integer clanId;
}