From dc194fb281e0e4c4ec34549adb4ad11f3cb67b35 Mon Sep 17 00:00:00 2001
From: whywhyo <1511349576@qq.com>
Date: 星期一, 05 六月 2023 20:13:30 +0800
Subject: [PATCH] 123
---
zhang-content/src/main/java/com/ruoyi/domain/ZProperty.java | 33 +++++++++++++++++++++++++++------
1 files changed, 27 insertions(+), 6 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 9709e07..f932166 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZProperty.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZProperty.java
@@ -1,12 +1,15 @@
package com.ruoyi.domain;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
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 java.io.Serializable;
+import java.util.Date;
/**
* <p>
@@ -23,18 +26,27 @@
private static final long serialVersionUID = 1L;
@TableId(value = "id", type = IdType.AUTO)
- private Integer id;
+ private Long id;
/**
* 鏈汉id
*/
- private Integer userId;
+ private Long userId;
+
+
+ @Excel(name = "鏃ユ湡",dateFormat = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date happenTime;
+
+
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date createTime;
/**
* 璐骇绫诲埆
*/
- @Excel(name = "璐骇绫诲埆",readConverterExp = "1=宸ヨ祫,2=瀛樻,3=鐞嗚储,4=瀹炰笟,5=鎴夸骇,6=璇佸埜,7=鑲＄エ,8=鍊哄埜,9=鏈熻揣,10=浜鸿韩,11=璐骇淇濋櫓,12=榛勯噾,13=閭エ,14=鍙ょ帺")
- private Integer type;
+ @Excel(name = "璐骇绫诲埆")
+ private String type;
/**
* 鏀舵敮鍚嶇О
@@ -46,7 +58,7 @@
* 閲戦
*/
@Excel(name = "閲戦")
- private Double price;
+ private String price;
/**
* 鏈熼檺
@@ -57,6 +69,7 @@
/**
* 鍙樻洿鎴栨敞閿�
*/
+ @Excel(name = "鍙樻洿鎴栨敞閿�")
private String isChange;
/**
@@ -79,8 +92,16 @@
private String url;
- @Excel(name = "鏄惁娉ㄩ攢",readConverterExp = "0=姝ｅ父,1=宸叉敞閿�")
+ @Excel(name = "鏄惁娉ㄩ攢(濉槸鎴栧惁)",readConverterExp = "0=鍚�,1=鏄�")
private Integer status;
+ @TableField(exist = false)
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date happenStartTime;
+
+ @TableField(exist = false)
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date happenEndTime;
+
}
--
Gitblit v1.9.1