From ef33492fa817c1a61589a25cc5a2721663f49e8c Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期一, 06 一月 2025 11:37:23 +0800
Subject: [PATCH] 添加了两个字段,已经修改了对应代码

---
 zhang-content/src/main/java/com/ruoyi/domain/dto/Genealogy.java |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/zhang-content/src/main/java/com/ruoyi/domain/dto/Genealogy.java b/zhang-content/src/main/java/com/ruoyi/domain/dto/Genealogy.java
index 1840d26..61ffddc 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/dto/Genealogy.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/dto/Genealogy.java
@@ -1,8 +1,10 @@
 package com.ruoyi.domain.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.annotation.Excel;
 import lombok.Data;
+import org.apache.ibatis.type.JdbcType;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -20,6 +22,8 @@
 
     private Long userId;
 
+
+    private Integer clanId;
     @Excel(name = "绗嚑浠�")
     private Integer identity;
 
@@ -46,4 +50,12 @@
     @Excel(name = "閰嶅伓")
     private String spouseName;
 
+    @Excel(name = "鏄惁鏄湰瀹跺涵鎴愬憳",readConverterExp = "0=鍚�,1=鏄�")
+    private Integer isMyFamily;
+
+
+    private Genealogy spouse;
+
+
+
 }

--
Gitblit v1.9.1