From 7070ffa6b493e75f79fe802dfc047ba3869d7b08 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期日, 25 八月 2024 21:31:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
zhang-content/src/main/java/com/ruoyi/domain/dto/Genealogy.java | 8 ++++++++
1 files changed, 8 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..94d2f3a 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
@@ -20,6 +20,8 @@
private Long userId;
+
+ private Integer clanId;
@Excel(name = "绗嚑浠�")
private Integer identity;
@@ -46,4 +48,10 @@
@Excel(name = "閰嶅伓")
private String spouseName;
+ @Excel(name = "鏄惁鏄湰瀹跺涵鎴愬憳",readConverterExp = "0=鍚�,1=鏄�")
+ private Integer isMyFamily;
+
+
+ private Genealogy spouse;
+
}
--
Gitblit v1.9.1