From 3cfa0bda6574d0c39db120c457e98a168aa193e8 Mon Sep 17 00:00:00 2001
From: Jinquan_Ou <Jinquan@gdut.com>
Date: 星期日, 23 四月 2023 17:15:20 +0800
Subject: [PATCH] 完成婚姻

---
 zhang-content/src/main/java/com/ruoyi/domain/ZMarry.java |  165 ++++++------------------------------------------------
 1 files changed, 20 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..add16f5 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,67 @@
 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 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")
+    private Date marryTime;
 
     /**
      * 鐢熻偛鎯呭喌,0锛氭湭鐢熻偛銆�1锛氬湪瀛曘��2锛氬凡鐢熻偛
      */
     private Integer bearStatus;
 
-    /**
-     * 鏄惁棰嗗彇璁″垝鐢熻偛鏈嶅姟鎵嬪唽
-     */
-    private Integer isJhsyfwsc;
+    private Integer handbookStatus;
 
-    /**
-     * 棰嗗彇璁″垝鐢熻偛鏈嶅姟鎵嬪唽鏃堕棿
-     */
-    private LocalDateTime getJhsyfwscDate;
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date handbookTime;
 
-    /**
-     * 鏄惁棰嗗彇鐙敓瀛愬コ璇�
-     */
-    private Integer isDsznz;
+    private Integer oneBorn;
 
-    /**
-     * 棰嗗彇鐙敓瀛愬コ璇佹椂闂�
-     */
-    private LocalDateTime getDsznzDate;
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date oneBornTime;
 
-    /**
-     * 闇�澹版槑鐨勬儏鍐�
-     */
     private String content;
 
-    /**
-     * 澶囨敞
-     */
     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