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 | 174 +++++++++------------------------------------------------
1 files changed, 29 insertions(+), 145 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 3ea76cf..2942a41 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZMarry.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZMarry.java
@@ -3,192 +3,76 @@
import com.baomidou.mybatisplus.annotation.IdType;
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;
+
import java.io.Serializable;
import java.time.LocalDateTime;
+import java.util.Date;
/**
* <p>
- *
+ *
* </p>
*
* @author ojq
* @since 2023-03-14
*/
@TableName("z_marry")
+@Data
+@ToString
public class ZMarry implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(value = "id", type = IdType.AUTO)
- private Integer id;
+ private Long id;
/**
* 鏈汉id
*/
- private Integer userId;
+ private Long userId;
/**
* 閰嶅伓id
*/
- private Integer spouseId;
+ private String spouseId;
/**
* 缁撳鏃堕棿
*/
- private LocalDateTime marryDate;
+ @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;
- /**
- * 鏄惁棰嗗彇璁″垝鐢熻偛鏈嶅姟鎵嬪唽
- */
- private Integer isJhsyfwsc;
+// @Excel(name = "鏄惁棰嗗彇璁″垝鐢熻偛鏈嶅姟鎵嬪唽",readConverterExp = "0=鍚�,1=鏄�")
+ private Integer handbookStatus;
- /**
- * 棰嗗彇璁″垝鐢熻偛鏈嶅姟鎵嬪唽鏃堕棿
- */
- private LocalDateTime getJhsyfwscDate;
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+// @Excel(name = "棰嗗彇璁″垝鐢熻偛鏈嶅姟鎵嬪唽鏃堕棿", dateFormat = "yyyy-MM-dd")
+ private Date handbookTime;
- /**
- * 鏄惁棰嗗彇鐙敓瀛愬コ璇�
- */
- private Integer isDsznz;
+// @Excel(name = "鏄惁棰嗗彇鐙敓瀛愬コ璇�", readConverterExp = "0=鍚�,1=鏄�")
+ private Integer oneBorn;
- /**
- * 棰嗗彇鐙敓瀛愬コ璇佹椂闂�
- */
- private LocalDateTime getDsznzDate;
+ @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 isDelete;
+ private Integer deleteStatus;
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Integer getUserId() {
- return userId;
- }
-
- public void setUserId(Integer userId) {
- this.userId = userId;
- }
-
- public Integer getSpouseId() {
- return spouseId;
- }
-
- public void setSpouseId(Integer spouseId) {
- this.spouseId = spouseId;
- }
-
- public LocalDateTime getMarryDate() {
- return marryDate;
- }
-
- public void setMarryDate(LocalDateTime marryDate) {
- this.marryDate = marryDate;
- }
-
- public Integer getBearStatus() {
- return bearStatus;
- }
-
- public void setBearStatus(Integer bearStatus) {
- this.bearStatus = bearStatus;
- }
-
- public Integer getIsJhsyfwsc() {
- return isJhsyfwsc;
- }
-
- public void setIsJhsyfwsc(Integer isJhsyfwsc) {
- this.isJhsyfwsc = isJhsyfwsc;
- }
-
- public LocalDateTime getGetJhsyfwscDate() {
- return getJhsyfwscDate;
- }
-
- public void setGetJhsyfwscDate(LocalDateTime getJhsyfwscDate) {
- this.getJhsyfwscDate = getJhsyfwscDate;
- }
-
- public Integer getIsDsznz() {
- return isDsznz;
- }
-
- public void setIsDsznz(Integer isDsznz) {
- this.isDsznz = isDsznz;
- }
-
- public LocalDateTime getGetDsznzDate() {
- return getDsznzDate;
- }
-
- public void setGetDsznzDate(LocalDateTime getDsznzDate) {
- this.getDsznzDate = getDsznzDate;
- }
-
- public String getContent() {
- return content;
- }
-
- public void setContent(String content) {
- this.content = content;
- }
-
- public String getRemark() {
- return remark;
- }
-
- public void setRemark(String remark) {
- this.remark = remark;
- }
-
- public Integer getIsDelete() {
- return isDelete;
- }
-
- public void setIsDelete(Integer isDelete) {
- this.isDelete = isDelete;
- }
-
- @Override
- public String toString() {
- return "ZMarry{" +
- "id=" + id +
- ", userId=" + userId +
- ", spouseId=" + spouseId +
- ", marryDate=" + marryDate +
- ", bearStatus=" + bearStatus +
- ", isJhsyfwsc=" + isJhsyfwsc +
- ", getJhsyfwscDate=" + getJhsyfwscDate +
- ", isDsznz=" + isDsznz +
- ", getDsznzDate=" + getDsznzDate +
- ", content=" + content +
- ", remark=" + remark +
- ", isDelete=" + isDelete +
- "}";
- }
}
--
Gitblit v1.9.1