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/ZfPetNote.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/ZfPetNote.java b/zhang-content/src/main/java/com/ruoyi/domain/ZfPetNote.java
index 97e96f7..303fe62 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZfPetNote.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZfPetNote.java
@@ -30,10 +30,13 @@
@TableId(value = "id", type = IdType.AUTO)
private Long id;
+ private String fileName;
+
+
/**
* 瀹犵墿id
*/
- private Long pid;
+ private String pid;
/**
* 璁板綍鏃堕棿
@@ -58,6 +61,7 @@
/**
* 鍒涘缓鏃堕棿
*/
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date createTime;
/**
@@ -70,17 +74,25 @@
@TableField(exist = false)
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date happenStartTime;
@TableField(exist = false)
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date happenEndTime;
@TableField(exist = false)
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date remindStartTime;
@TableField(exist = false)
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date remindEndTime;
+ /**
+ * 鍒嗕韩浜篿d
+ */
+ private Integer shareId;
--
Gitblit v1.9.1