From 1be203a13ebe5f71aebbc047feecaa063a1ec239 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 03 十二月 2024 20:33:26 +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 | 9 +++++++++
1 files changed, 9 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..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;
@@ -49,4 +53,9 @@
@Excel(name = "鏄惁鏄湰瀹跺涵鎴愬憳",readConverterExp = "0=鍚�,1=鏄�")
private Integer isMyFamily;
+
+ private Genealogy spouse;
+
+
+
}
--
Gitblit v1.9.1