From 2475ec4a6b3b85b8d783890da5508740319213f4 Mon Sep 17 00:00:00 2001
From: Jinquan_Ou <Jinquan@gdut.com>
Date: 星期一, 24 四月 2023 23:27:49 +0800
Subject: [PATCH] 456

---
 zhang-content/src/main/java/com/ruoyi/domain/ZfPet.java |  164 +++++++++++-------------------------------------------
 1 files changed, 35 insertions(+), 129 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 9b3db02..9ae3d69 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZfPet.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZfPet.java
@@ -3,8 +3,14 @@
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import lombok.Data;
+import lombok.ToString;
+
 import java.io.Serializable;
 import java.time.LocalDate;
+import java.util.Date;
 
 /**
  * <p>
@@ -15,194 +21,94 @@
  * @since 2023-03-12
  */
 @TableName("zf_pet")
+@Data
+@ToString
 public class ZfPet implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
     @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
+    private Long id;
 
     /**
-     * 鐘瘉鍙风爜
+     * 瀹犵墿鍙风爜
      */
+    @Excel(name = "瀹犵墿鍙风爜")
     private String idNum;
 
     /**
      * 闃蹭吉鐮�
      */
+    @Excel(name = "闃蹭吉鐮�")
     private String securityCode;
 
     /**
-     * 鐘
+     * 瀹犵墿鍝佺
      */
+    @Excel(name = "瀹犵墿鍝佺")
     private String type;
 
     /**
-     * 鐘悕
+     * 瀹犵墿鍚嶇О
      */
+    @Excel(name = "瀹犵墿鍚嶇О")
     private String name;
 
     /**
      * 鍑虹敓鏃ユ湡
      */
-    private LocalDate birth;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "鍑虹敓鏃ユ湡", dateFormat = "yyyy-MM-dd")
+    private Date birth;
 
     /**
      * 鎬у埆,0:闆�,1:闆�
      */
+    @Excel(name = "鎬у埆",readConverterExp = "0=闆�,1=闆�")
     private Integer sex;
 
     /**
-     * 鐘彧棰滆壊
+     * 瀹犵墿棰滆壊
      */
+    @Excel(name = "瀹犵墿棰滆壊")
     private String color;
 
     /**
-     * 鐘彧鎬ц川
+     * 瀹犵墿鎬ц川
      */
+    @Excel(name = "瀹犵墿鎬ц川")
     private String properties;
 
     /**
      * 楗涔犳儻
      */
+    @Excel(name = "楗涔犳儻(鍠滃ソ)")
     private String eatHabit;
 
     /**
      * 鐢熸椿涔犳儻
      */
+    @Excel(name = "鐢熸椿涔犳儻(鍠滃ソ)")
     private String lifeHabit;
+
+    @Excel(name = "楗涔犳儻(鍘屾伓)")
+    private String disEatHabit;
+
+    @Excel(name = "鐢熸椿涔犳儻(鍘屾伓)")
+    private String disLifeHabit;
 
     /**
      * 鐘眳浣忓湴鍧�
      */
+    @Excel(name = "瀹犵墿灞呬綇鍦板潃")
     private String address;
 
     /**
      * 鑳藉惉鎳傜殑鏂硅█
      */
+    @Excel(name = "鑳藉惉鎳傜殑鏂硅█")
     private String dialect;
 
+    private String url;
 
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getIdNum() {
-        return idNum;
-    }
-
-    public void setIdNum(String idNum) {
-        this.idNum = idNum;
-    }
-
-    public String getSecurityCode() {
-        return securityCode;
-    }
-
-    public void setSecurityCode(String securityCode) {
-        this.securityCode = securityCode;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public LocalDate getBirth() {
-        return birth;
-    }
-
-    public void setBirth(LocalDate birth) {
-        this.birth = birth;
-    }
-
-    public Integer getSex() {
-        return sex;
-    }
-
-    public void setSex(Integer sex) {
-        this.sex = sex;
-    }
-
-    public String getColor() {
-        return color;
-    }
-
-    public void setColor(String color) {
-        this.color = color;
-    }
-
-    public String getProperties() {
-        return properties;
-    }
-
-    public void setProperties(String properties) {
-        this.properties = properties;
-    }
-
-    public String getEatHabit() {
-        return eatHabit;
-    }
-
-    public void setEatHabit(String eatHabit) {
-        this.eatHabit = eatHabit;
-    }
-
-    public String getLifeHabit() {
-        return lifeHabit;
-    }
-
-    public void setLifeHabit(String lifeHabit) {
-        this.lifeHabit = lifeHabit;
-    }
-
-    public String getAddress() {
-        return address;
-    }
-
-    public void setAddress(String address) {
-        this.address = address;
-    }
-
-    public String getDialect() {
-        return dialect;
-    }
-
-    public void setDialect(String dialect) {
-        this.dialect = dialect;
-    }
-
-    @Override
-    public String toString() {
-        return "ZfPet{" +
-        "id=" + id +
-        ", idNum=" + idNum +
-        ", securityCode=" + securityCode +
-        ", type=" + type +
-        ", name=" + name +
-        ", birth=" + birth +
-        ", sex=" + sex +
-        ", color=" + color +
-        ", properties=" + properties +
-        ", eatHabit=" + eatHabit +
-        ", lifeHabit=" + lifeHabit +
-        ", address=" + address +
-        ", dialect=" + dialect +
-        "}";
-    }
 }

--
Gitblit v1.9.1