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 | 8 ++++----
1 files changed, 4 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 442efe1..b08a6e2 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java
@@ -231,6 +231,10 @@
*/
private String secondFamilyId;
+ /**
+ * 鍒ゆ柇鍞竴鐨勭敤鎴风紪鐮�
+ */
+ private String uaid;
private Long sysId;
/**
@@ -250,8 +254,4 @@
*/
@TableField(exist = false)
private List<ZInfoUser> childList;
-
-
-
-
}
--
Gitblit v1.9.1