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

zqy

2026-01-04 0eb444f93724d63d4bf4d18e5bd120ec86bf8c22

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

@@ -35,13 +35,16 @@
    /**
     * 家庭名称
     */
    @Excel(name="父亲id")
//    @Excel(name="父亲id")

    private Long fid;

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



    private Integer clanId;


}