Merge remote-tracking branch 'origin/master'

feige

2024-11-05 b4895bdc5d9268e55c0023b92cc7c2d68ba33e46

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

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

    private Long fid;

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



    private Integer clanId;


}