From e3cc5fb859a4e3c56c1dfa4d7892b233a30874fa Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 12 四月 2024 15:32:33 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/entity/pp/DeviceMaintenance.java | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/pp/DeviceMaintenance.java b/north-glass-erp/src/main/java/com/example/erp/entity/pp/DeviceMaintenance.java
index 7f18bd0..4c23cad 100644
--- a/north-glass-erp/src/main/java/com/example/erp/entity/pp/DeviceMaintenance.java
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/pp/DeviceMaintenance.java
@@ -1,5 +1,6 @@
package com.example.erp.entity.pp;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
@@ -20,8 +21,6 @@
//鏁呴殰鏃ユ湡
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime faultTime;
- //鏁呴殰鍘熷洜
- private String faultReason;
//淇濆吇鏃ユ湡
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime maintenanceTime;
@@ -43,8 +42,24 @@
private LocalDateTime createTime;
//淇敼鏃堕棿
private LocalDateTime updateTime;
+ //鏁呴殰鍘熷洜
+ private String faultReason;
//澶栭敭璁惧琛�
private Device device;
+ @TableField(select = false,exist= false)
+ private String faultCount;
+ @TableField(select = false,exist= false)
+ private String maintenanceCount;
+ @TableField(select = false,exist= false)
+ private String faultLastTime;
+ @TableField(select = false,exist= false)
+ private String maintenanceLastTime;
+ @TableField(select = false,exist= false)
+ private String faultCost;
+ @TableField(select = false,exist= false)
+ private String maintenanceCost;
+
+
}
--
Gitblit v1.8.0