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/ZProperty.java |  107 +++++++----------------------------------------------
 1 files changed, 14 insertions(+), 93 deletions(-)

diff --git a/zhang-content/src/main/java/com/ruoyi/domain/ZProperty.java b/zhang-content/src/main/java/com/ruoyi/domain/ZProperty.java
index 6e27dda..9709e07 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZProperty.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZProperty.java
@@ -3,6 +3,9 @@
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.annotation.Excel;
+import lombok.Data;
+
 import java.io.Serializable;
 
 /**
@@ -14,6 +17,7 @@
  * @since 2023-03-14
  */
 @TableName("z_property")
+@Data
 public class ZProperty implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -29,21 +33,25 @@
     /**
      * 璐骇绫诲埆
      */
+    @Excel(name = "璐骇绫诲埆",readConverterExp = "1=宸ヨ祫,2=瀛樻,3=鐞嗚储,4=瀹炰笟,5=鎴夸骇,6=璇佸埜,7=鑲＄エ,8=鍊哄埜,9=鏈熻揣,10=浜鸿韩,11=璐骇淇濋櫓,12=榛勯噾,13=閭エ,14=鍙ょ帺")
     private Integer type;
 
     /**
      * 鏀舵敮鍚嶇О
      */
+    @Excel(name = "鏀舵敮鍚嶇О")
     private String incomeName;
 
     /**
      * 閲戦
      */
+    @Excel(name = "閲戦")
     private Double price;
 
     /**
      * 鏈熼檺
      */
+    @Excel(name = "鏈熼檺")
     private String timeLimit;
 
     /**
@@ -54,112 +62,25 @@
     /**
      * 浜ф潈
      */
+    @Excel(name = "浜ф潈")
     private String propertyRight;
 
     /**
      * 瀛樻斁浣嶇疆
      */
+    @Excel(name = "瀛樻斁浣嶇疆")
     private String location;
 
     /**
      * 澶囨敞
      */
+    @Excel(name = "澶囨敞")
     private String remark;
 
+    private String url;
 
-    public Integer getId() {
-        return id;
-    }
+    @Excel(name = "鏄惁娉ㄩ攢",readConverterExp = "0=姝ｅ父,1=宸叉敞閿�")
+    private Integer status;
 
-    public void setId(Integer id) {
-        this.id = id;
-    }
 
-    public Integer getUserId() {
-        return userId;
-    }
-
-    public void setUserId(Integer userId) {
-        this.userId = userId;
-    }
-
-    public Integer getType() {
-        return type;
-    }
-
-    public void setType(Integer type) {
-        this.type = type;
-    }
-
-    public String getIncomeName() {
-        return incomeName;
-    }
-
-    public void setIncomeName(String incomeName) {
-        this.incomeName = incomeName;
-    }
-
-    public Double getPrice() {
-        return price;
-    }
-
-    public void setPrice(Double price) {
-        this.price = price;
-    }
-
-    public String getTimeLimit() {
-        return timeLimit;
-    }
-
-    public void setTimeLimit(String timeLimit) {
-        this.timeLimit = timeLimit;
-    }
-
-    public String getIsChange() {
-        return isChange;
-    }
-
-    public void setIsChange(String isChange) {
-        this.isChange = isChange;
-    }
-
-    public String getPropertyRight() {
-        return propertyRight;
-    }
-
-    public void setPropertyRight(String propertyRight) {
-        this.propertyRight = propertyRight;
-    }
-
-    public String getLocation() {
-        return location;
-    }
-
-    public void setLocation(String location) {
-        this.location = location;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    @Override
-    public String toString() {
-        return "ZProperty{" +
-        "id=" + id +
-        ", userId=" + userId +
-        ", type=" + type +
-        ", incomeName=" + incomeName +
-        ", price=" + price +
-        ", timeLimit=" + timeLimit +
-        ", isChange=" + isChange +
-        ", propertyRight=" + propertyRight +
-        ", location=" + location +
-        ", remark=" + remark +
-        "}";
-    }
 }

--
Gitblit v1.9.1