Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_backend

zqy

2024-09-10 01a9d85aef5ed445acdc7f68798fa19efd480e2e

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

@@ -39,6 +39,12 @@

    private Long fid;

    @Excel(name="母亲id")
    private Long mid;



    private Integer clanId;


}