From db69e6a02f18a3440dd77aef648b56a964b91021 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 06 八月 2024 19:23:11 +0800
Subject: [PATCH] 修改导入用户，注册bug

---
 zhang-content/src/main/java/com/ruoyi/domain/ZSelfNote.java |  100 +++++++++++++++++++------------------------------
 1 files changed, 39 insertions(+), 61 deletions(-)

diff --git a/zhang-content/src/main/java/com/ruoyi/domain/ZSelfNote.java b/zhang-content/src/main/java/com/ruoyi/domain/ZSelfNote.java
index a072ff2..90d792f 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZSelfNote.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZSelfNote.java
@@ -1,10 +1,16 @@
 package com.ruoyi.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 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 java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * <p>
@@ -15,96 +21,68 @@
  * @since 2023-03-14
  */
 @TableName("z_self_note")
+@Data
 public class ZSelfNote 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 uid;
 
     /**
      * 鍦扮偣
      */
+    @Excel(name = "鍦扮偣")
     private String address;
-
-    /**
-     * 鏃堕棿
-     */
-    private LocalDateTime noteDate;
 
     /**
      * 鏍囬
      */
+    @Excel(name = "浜嬩欢鏍囬")
     private String title;
 
     /**
      * 澶囨敞
      */
+    @Excel(name = "澶囨敞")
     private String remark;
 
+    /**
+     * 浜虹墿
+     */
+    @Excel(name = "浜虹墿")
+    private String people;
 
-    public Integer getId() {
-        return id;
-    }
+    /**
+     * 鍒涘缓鏃堕棿
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date createTime;
 
-    public void setId(Integer id) {
-        this.id = id;
-    }
+    /**
+     * 鍙戠敓鏃堕棿
+     */
+    @Excel(name = "鏃堕棿",dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date happenTime;
 
-    public Integer getUserId() {
-        return userId;
-    }
+    /**
+     * 鐢靛瓙鏂囦欢璺緞
+     */
+    @Excel(name = "鐢靛瓙鏂囦欢璺緞")
+    private String url;
 
-    public void setUserId(Integer userId) {
-        this.userId = userId;
-    }
+    @TableField(exist = false)
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date happenStartTime;
 
-    public String getAddress() {
-        return address;
-    }
+    @TableField(exist = false)
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date happenEndTime;
 
-    public void setAddress(String address) {
-        this.address = address;
-    }
-
-    public LocalDateTime getNoteDate() {
-        return noteDate;
-    }
-
-    public void setNoteDate(LocalDateTime noteDate) {
-        this.noteDate = noteDate;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    @Override
-    public String toString() {
-        return "ZSelfNote{" +
-        "id=" + id +
-        ", userId=" + userId +
-        ", address=" + address +
-        ", noteDate=" + noteDate +
-        ", title=" + title +
-        ", remark=" + remark +
-        "}";
-    }
 }

--
Gitblit v1.9.1