From b1643b619696f2578e22d7f3bcc2cacca63a1ce6 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期日, 26 五月 2024 22:26:25 +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/ZfPet.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/ZfPet.java b/zhang-content/src/main/java/com/ruoyi/domain/ZfPet.java
index d320188..a7482ba 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZfPet.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZfPet.java
@@ -49,6 +49,9 @@
@Excel(name = "瀹犵墿鍝佺")
private String type;
+ @Excel(name = "瀹犵墿绫诲瀷")
+ private String animal;
+
/**
* 瀹犵墿鍚嶇О
*/
@@ -143,5 +146,13 @@
@Excel(name = "涓讳汉鍦板潃")
private String masterAddress;
+ @TableField(exist = false)
+ @Excel(name = "鍑虹敓鏃ユ湡", dateFormat = "yyyy-MM-dd")
+ private Date birthStart;
+
+ @TableField(exist = false)
+ @Excel(name = "鍑虹敓鏃ユ湡", dateFormat = "yyyy-MM-dd")
+ private Date birthEnd;
+
}
--
Gitblit v1.9.1