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/dto/MarryInfoDto.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/zhang-content/src/main/java/com/ruoyi/domain/dto/MarryInfoDto.java b/zhang-content/src/main/java/com/ruoyi/domain/dto/MarryInfoDto.java
index 9a550d6..a9363c7 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/dto/MarryInfoDto.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/dto/MarryInfoDto.java
@@ -92,6 +92,8 @@
     @Excel(name = "閰嶅伓鎴风睄鍦板潃")
     private String spouseAddress;
 
+    private Long uid;
+
 //    //閰嶅伓鐨勬暟鎹�
 //    private Long spouseId;
 //    //    @ExcelProperty(value = {"閰嶅伓淇℃伅","濮撳悕"})

--
Gitblit v1.9.1