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/ZfPet.java | 17 +++++++++++++++++
1 files changed, 17 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..bce44bb 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZfPet.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZfPet.java
@@ -31,6 +31,7 @@
@TableId(value = "id", type = IdType.AUTO)
private String id;
+ private String fileName;
/**
* 瀹犵墿鍙风爜
*/
@@ -48,6 +49,9 @@
*/
@Excel(name = "瀹犵墿鍝佺")
private String type;
+
+ @Excel(name = "瀹犵墿绫诲瀷")
+ private String animal;
/**
* 瀹犵墿鍚嶇О
@@ -143,5 +147,18 @@
@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;
+
+ /**
+ * 鍒嗕韩浜篿d
+ */
+ private Integer shareId;
+
}
--
Gitblit v1.9.1