Merge remote-tracking branch 'origin/master'

feige

2025-05-06 e6294707131b0c4dd7304713d8f59f91658394dd

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

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

    private Long mid;
    private Long sysId;


    private Integer clanId;
}