From b02beccf4567068cb47a3f1181a00039456c872d Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期三, 06 八月 2025 15:37:20 +0800
Subject: [PATCH] 用户修改姓名和电话同步修改uaid

---
 zhang-content/src/main/java/com/ruoyi/domain/ZMarry.java |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/zhang-content/src/main/java/com/ruoyi/domain/ZMarry.java b/zhang-content/src/main/java/com/ruoyi/domain/ZMarry.java
index add16f5..2942a41 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZMarry.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZMarry.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
 import lombok.Data;
 import lombok.ToString;
 
@@ -43,25 +44,33 @@
      * 缁撳鏃堕棿
      */
     @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+//    @Excel(name = "缁撳鏃堕棿", dateFormat = "yyyy-MM-dd")
     private Date marryTime;
 
     /**
      * 鐢熻偛鎯呭喌,0锛氭湭鐢熻偛銆�1锛氬湪瀛曘��2锛氬凡鐢熻偛
      */
+//    @Excel(name = "鐢熻偛鎯呭喌",readConverterExp = "0=鏈敓鑲�,1=鍦ㄥ瓡,2=宸茬敓鑲�")
     private Integer bearStatus;
 
+//    @Excel(name = "鏄惁棰嗗彇璁″垝鐢熻偛鏈嶅姟鎵嬪唽",readConverterExp = "0=鍚�,1=鏄�")
     private Integer handbookStatus;
 
     @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+//    @Excel(name = "棰嗗彇璁″垝鐢熻偛鏈嶅姟鎵嬪唽鏃堕棿", dateFormat = "yyyy-MM-dd")
     private Date handbookTime;
 
+//    @Excel(name = "鏄惁棰嗗彇鐙敓瀛愬コ璇�", readConverterExp = "0=鍚�,1=鏄�")
     private Integer oneBorn;
 
     @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+//    @Excel(name = "棰嗗彇鐙敓瀛愬コ璇佹椂闂�", dateFormat = "yyyy-MM-dd")
     private Date oneBornTime;
 
+//    @Excel(name = "闇�澹版槑鐨勬儏鍐�")
     private String content;
 
+//    @Excel(name = "澶囨敞")
     private String remark;
 
     private Integer deleteStatus;

--
Gitblit v1.9.1