Merge remote-tracking branch 'origin/master'

feige

2024-11-05 b4895bdc5d9268e55c0023b92cc7c2d68ba33e46

 zhang-content/src/main/java/com/ruoyi/domain/dto/Genealogy.java

@@ -20,6 +20,8 @@

    private Long userId;


    private Integer clanId;
    @Excel(name = "第几代")
    private Integer identity;