From 82137fdbb4fc7d990b6f4d91f33ca80becad4545 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 01 八月 2024 17:06:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/TMonitor.java | 37 +++++--------------------------------
1 files changed, 5 insertions(+), 32 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..92430f4 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;
@@ -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