Merge remote-tracking branch 'origin/master'

jinquanOu

2024-06-11 5d7b0a0bbcae6844e2296ef53c3f4c88293dacfe

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

@@ -27,5 +27,18 @@
    /**
     * 家庭名称
     */
    @Excel(name="家庭号")

    private String name;


    /**
     * 家庭名称
     */
    @Excel(name="父亲id")

    private Long fid;



}