zhangshi_app_backend.git

			@@ -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;



			}