From 79b75c02532e9826088a216130f6a1be8c15278d Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 05 十一月 2024 21:30:01 +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/ZInfoUser.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java b/zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java
index 63896ab..095b1b3 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java
@@ -149,6 +149,12 @@
@Excel(name = "鏄惁鏄湰瀹跺涵鎴愬憳",readConverterExp = "0=鍚�,1=鏄�")
private Integer isMyFamily;
+ /**
+ * 鑷垜浠嬬粛
+ */
+
+ @Excel(name = "鑷垜浠嬬粛")
+ private String selfIntroduction;
@TableField(exist = false)
private String familyName;
@@ -223,10 +229,7 @@
*/
private String secondFamilyId;
- /**
- * 鑷垜浠嬬粛
- */
- private String selfIntroduction;
+
private Long sysId;
/**
* 浠ｆ暟
--
Gitblit v1.9.1