From 68af47f24bc344d2e1c5e1a848458b38679ddad4 Mon Sep 17 00:00:00 2001
From: fei <791364011@qq.com>
Date: 星期一, 06 十月 2025 08:39:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java | 26 ++++++--------------------
1 files changed, 6 insertions(+), 20 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 b6e5d53..a502e22 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java
@@ -177,14 +177,13 @@
/**
* 鐖朵翰鐨刬d
*/
- @TableField(updateStrategy = FieldStrategy.IGNORED)
-
+// @TableField(updateStrategy = FieldStrategy.IGNORED)
private Long fatherId;
/**
* 姣嶄翰鐨刬d
*/
- @TableField(updateStrategy = FieldStrategy.IGNORED)
+// @TableField(updateStrategy = FieldStrategy.IGNORED)
private Long momId;
@@ -231,6 +230,10 @@
*/
private String secondFamilyId;
+ /**
+ * 鍒ゆ柇鍞竴鐨勭敤鎴风紪鐮�
+ */
+ private String uaid;
private Long sysId;
/**
@@ -250,21 +253,4 @@
*/
@TableField(exist = false)
private List<ZInfoUser> childList;
-
- /**
- * 寮�濮嬫椂闂� 鐢熸棩
- */
- @JsonFormat(pattern = "yyyy-MM-dd")
- @TableField(exist = false, jdbcType = JdbcType.TIMESTAMP)
- private Date happenStartTime;
-
- /**
- * 缁撴潫鏃堕棿
- */
- @JsonFormat(pattern = "yyyy-MM-dd")
- @TableField(exist = false, jdbcType = JdbcType.TIMESTAMP)
- private Date happenEndTime;
-
-
-
}
--
Gitblit v1.9.1