From ae536b434f6eae2a64b4ce30cd8def726ff05a0a Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期日, 22 六月 2025 22:47:02 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_backend

---
 zhang-content/src/main/java/com/ruoyi/domain/sysUserAndUserInfo.java |    6 ++++++
 1 files changed, 6 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 c8ded2b..7579279 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/sysUserAndUserInfo.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/sysUserAndUserInfo.java
@@ -72,4 +72,10 @@
 
     private Long mid;
     private Long sysId;
+
+
+    private Integer clanId;
+
+    /** 濠氬Щ鐘跺喌(0:鏈,1:宸插,2:绂诲) */
+    private Integer maritalStatus;
 }

--
Gitblit v1.9.1