From 462c16ca4ec52bdea6cbb35514e8fd78d6b5f38c Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期三, 17 五月 2023 15:20:00 +0800
Subject: [PATCH] 合并不行
---
zhang-content/src/main/java/com/ruoyi/domain/ZfPet.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 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 7cba7ea..6b93ad1 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZfPet.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZfPet.java
@@ -82,14 +82,20 @@
/**
* 楗涔犳儻
*/
- @Excel(name = "楗涔犳儻")
+ @Excel(name = "楗涔犳儻(鍠滃ソ)")
private String eatHabit;
/**
* 鐢熸椿涔犳儻
*/
- @Excel(name = "鐢熸椿涔犳儻")
+ @Excel(name = "鐢熸椿涔犳儻(鍠滃ソ)")
private String lifeHabit;
+
+ @Excel(name = "楗涔犳儻(鍘屾伓)")
+ private String disEatHabit;
+
+ @Excel(name = "鐢熸椿涔犳儻(鍘屾伓)")
+ private String disLifeHabit;
/**
* 鐘眳浣忓湴鍧�
@@ -105,4 +111,7 @@
private String url;
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date createTime;
+
}
--
Gitblit v1.9.1