Merge remote-tracking branch 'origin/master'

feige

2024-10-07 de1823591a01addd54cb1aab4d78397dcb020472

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

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

    private Long mid;
    private Long sysId;


    private Integer clanId;
}