From 7203538f18639d9f7fa952734763aaf9417ebda1 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期日, 10 十一月 2024 15:17:29 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_backend
---
zhang-content/src/main/java/com/ruoyi/domain/dto/Genealogy.java | 5 +++++
1 files changed, 5 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 e54c53e..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;
@@ -49,4 +51,7 @@
@Excel(name = "鏄惁鏄湰瀹跺涵鎴愬憳",readConverterExp = "0=鍚�,1=鏄�")
private Integer isMyFamily;
+
+ private Genealogy spouse;
+
}
--
Gitblit v1.9.1