From 2b776c4a2222d9bc36f53a449bda2b808c7b43b9 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期六, 03 八月 2024 14:38:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/TMonitor.java | 41 +++++++----------------------------------
1 files changed, 7 insertions(+), 34 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/TMonitor.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/TMonitor.java
index 51d98e6..296b1ba 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/TMonitor.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/TMonitor.java
@@ -1,6 +1,7 @@
package com.ycl.platform.domain.entity;
import annotation.Excel;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ycl.system.entity.BaseEntity;
@@ -48,7 +49,7 @@
@Excel(name = "璁惧缁忓害锛岃嚦灏戜繚鐣欏叚浣嶅皬鏁�")
private String longitude;
- /** 璁惧缁村害锛岃嚦灏戜繚鐣欏叚浣嶅皬鏁� */
+ /** 璁惧绾害锛岃嚦灏戜繚鐣欏叚浣嶅皬鏁� */
@Excel(name = "璁惧缁村害锛岃嚦灏戜繚鐣欏叚浣嶅皬鏁�")
private String latitude;
@@ -97,7 +98,7 @@
@Excel(name = "绠＄悊鍗曚綅鑱旂郴鏂瑰紡")
private String muContactInfo;
- /** 褰曡薄淇濆瓨澶╂暟 0 - 2147483647 */
+ /** 褰曞儚淇濆瓨澶╂暟 0 - 2147483647 */
@Excel(name = "褰曡薄淇濆瓨澶╂暟 0 - 2147483647")
private Long storageDays;
@@ -141,15 +142,8 @@
@Excel(name = "绫诲瀷缂栫爜 : [131.鎽勫儚鏈虹紪鐮�;132.缃戠粶鎽勫儚鏈虹紪鐮�;]")
private Long lxbm;
- @Excel(name = "寮傚父鍘熷洜")
- private String reason;
-
- @Excel(name ="寮傚父鎭㈠鏍囪瘑")
- private Long recovery;
-
- @Excel(name = "寮傚父鎭㈠鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date recoveryTime;
+ @TableField(exist = false)
+ private Integer recovery;
private Long deptId;
@@ -169,31 +163,13 @@
return installedTime;
}
- public Date getRecoveryTime() {
- return recoveryTime;
- }
-
- public void setRecoveryTime(Date recoveryTime) {
- this.recoveryTime = recoveryTime;
- }
-
- public Long getRecovery() {
+ public Integer getRecovery() {
return recovery;
}
- public void setRecovery(Long recovery) {
+ public void setRecovery(Integer recovery) {
this.recovery = recovery;
}
-
- public String getReason() {
- return reason;
- }
-
- public void setReason(String reason) {
- this.reason = reason;
- }
-
-
public void setId(Long id)
{
@@ -501,9 +477,6 @@
", cameraDept='" + cameraDept + '\'' +
", hybm='" + hybm + '\'' +
", lxbm=" + lxbm +
- ", reason='" + reason + '\'' +
- ", recovery=" + recovery +
- ", recoveryTime=" + recoveryTime +
", deptId=" + deptId +
'}';
}
--
Gitblit v1.8.0