From c24698dacd5d43d99bbae35b430a189675a6532b Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期二, 06 五月 2025 17:08:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
zhang-content/src/main/java/com/ruoyi/domain/ZfPetNote.java | 11 ++++++++++-
1 files changed, 10 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..c68453f 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZfPetNote.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZfPetNote.java
@@ -33,7 +33,7 @@
/**
* 瀹犵墿id
*/
- private Long pid;
+ private String pid;
/**
* 璁板綍鏃堕棿
@@ -58,6 +58,7 @@
/**
* 鍒涘缓鏃堕棿
*/
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date createTime;
/**
@@ -70,17 +71,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