Merge remote-tracking branch 'origin/master'

feige

2025-05-06 c24698dacd5d43d99bbae35b430a189675a6532b

 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;


}