From cb22e2441394cd61116d64a844708ca9390a0529 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期日, 21 七月 2024 18:43:55 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_backend
---
zhang-content/src/main/java/com/ruoyi/domain/ZfPetNote.java | 7 ++++++-
1 files changed, 6 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..2cd6bb7 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,15 +71,19 @@
@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;
--
Gitblit v1.9.1