From df78e9074d62a146d68752d65a65baf8d6efa66f Mon Sep 17 00:00:00 2001 From: whywhyo <1511349576@qq.com> Date: 星期一, 21 八月 2023 22:59:57 +0800 Subject: [PATCH] 652487 --- zhang-content/src/main/java/com/ruoyi/domain/ZfEquipment.java | 35 ++++++++++++++++++++++++++++++----- 1 files changed, 30 insertions(+), 5 deletions(-) diff --git a/zhang-content/src/main/java/com/ruoyi/domain/ZfEquipment.java b/zhang-content/src/main/java/com/ruoyi/domain/ZfEquipment.java index b7448fe..bca3e8f 100644 --- a/zhang-content/src/main/java/com/ruoyi/domain/ZfEquipment.java +++ b/zhang-content/src/main/java/com/ruoyi/domain/ZfEquipment.java @@ -36,11 +36,10 @@ private String name; /** - * 璁板綍鏃堕棿 + * 鎻掑叆鏃堕棿 */ @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "鍒涘缓鏃堕棿", dateFormat = "yyyy-MM-dd") - private Date createDate; + private Date createTime; /** * 璐拱浜� @@ -69,8 +68,8 @@ /** * 瀹跺涵id */ - @Excel(name = "瀹跺涵id") - private String familyId; + @Excel(name = "鎵�灞炲搴紪鍙�(瀵煎叆鏁版嵁鏃惰鍒犻櫎姝ゆ爮)") + private Long familyId; private String url; @@ -78,5 +77,31 @@ private Integer status; + /** + * 鏄惁鏄湰瀹跺涵鐨勬暟鎹�(0:涓嶆槸,1:鏄�) + */ + @TableField(exist = false) + private Integer ownData = 0; + + /** + * 寮�濮嬫椂闂� + */ + @TableField(exist = false) + private Date happenStartTime; + + /** + * 缁撴潫鏃堕棿 + */ + @TableField(exist = false) + private Date happenEndTime; + + /** + * 璁板綍鏃堕棿 + */ + @Excel(name = "鏃堕棿", dateFormat = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + private Date happenTime; + + } -- Gitblit v1.9.1