From 9d31915e99fcd5e5fc3b9453eb570fc2358e0179 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 14 一月 2025 16:48:30 +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 | 6 ++++++
1 files changed, 6 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 2eb3536..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;
@@ -52,4 +56,6 @@
private Genealogy spouse;
+
+
}
--
Gitblit v1.9.1