From 7070ffa6b493e75f79fe802dfc047ba3869d7b08 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期日, 25 八月 2024 21:31:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
zhang-content/src/main/java/com/ruoyi/domain/ZfAncestor.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/ZfAncestor.java b/zhang-content/src/main/java/com/ruoyi/domain/ZfAncestor.java
index a774553..bcabd02 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZfAncestor.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZfAncestor.java
@@ -45,14 +45,19 @@
*/
private Integer status;
- /**
- * 鏄惁鏈
- */
- private Integer isMyFamily;
-
+// /**
+// * 鏄惁鏈
+// */
+// private Integer isMyFamily;
+//
/**
*閰嶅伓id
*/
private Integer spouseId;
+ /**
+ *瀵嗙爜
+ */
+ private String password;
+
}
--
Gitblit v1.9.1