From 8d0db2a5b91a38960855ab3f5ee3e92fe363e8e2 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期一, 23 六月 2025 20:20:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 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 095b1b3..b08a6e2 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java
@@ -5,8 +5,10 @@
import com.ruoyi.common.annotation.Excel;
import lombok.Data;
import lombok.ToString;
+import org.apache.ibatis.type.JdbcType;
import java.io.Serializable;
+import java.sql.Timestamp;
import java.time.LocalDate;
import java.util.Date;
import java.util.List;
@@ -229,6 +231,10 @@
*/
private String secondFamilyId;
+ /**
+ * 鍒ゆ柇鍞竴鐨勭敤鎴风紪鐮�
+ */
+ private String uaid;
private Long sysId;
/**
@@ -248,7 +254,4 @@
*/
@TableField(exist = false)
private List<ZInfoUser> childList;
-
-
-
}
--
Gitblit v1.9.1