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/sysUserAndUserInfo.java | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/sysUserAndUserInfo.java b/zhang-content/src/main/java/com/ruoyi/domain/sysUserAndUserInfo.java
index 2fab50c..7579279 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/sysUserAndUserInfo.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/sysUserAndUserInfo.java
@@ -75,4 +75,7 @@
private Integer clanId;
+
+ /** 濠氬Щ鐘跺喌(0:鏈,1:宸插,2:绂诲) */
+ private Integer maritalStatus;
}
--
Gitblit v1.9.1