Merge remote-tracking branch 'origin/master'

feige

2024-08-25 7070ffa6b493e75f79fe802dfc047ba3869d7b08

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

@@ -180,7 +180,7 @@
    private Long momId;

    /**
     * 母亲的id
     * 家族的id
     */
    private Integer clanId;