From 4008d83696a6998ce987133ae2d2b0ec912cf178 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期日, 07 四月 2024 09:40:12 +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 | 30 ++++++++++++++++++++++--------
1 files changed, 22 insertions(+), 8 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 a9cd2c5..7f18bd0 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,34 +1,48 @@
package com.example.erp.entity.pp;
-import java.time.LocalDate;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+@Data
public class DeviceMaintenance {
+
//鑷id
private Integer id;
//璁惧缂栧彿
private String deviceId;
+ //璁惧鍚嶇О
+ private String deviceName;
//绫诲瀷
- private Integer type;
+ private String type;
//鏁呴殰鏃ユ湡
- private LocalDate faultTime;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime faultTime;
//鏁呴殰鍘熷洜
private String faultReason;
//淇濆吇鏃ユ湡
- private LocalDate maintenanceTime;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime maintenanceTime;
//淇濆吇璇存槑
private String maintenanceIllustrate;
//缁翠慨/淇濆吇寮�濮嬫椂闂�
- private LocalDate startTime;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime startTime;
//缁翠慨/淇濆吇缁撴潫鏃堕棿
- private LocalDate stopTime;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime stopTime;
+ //鎵�鍦ㄥ伐搴�
+ private String process;
//缁翠慨/淇濆吇浜哄憳
private String personnel;
//璐圭敤
private String cost;
//鍒涘缓鏃堕棿
- private LocalDate createTime;
+ private LocalDateTime createTime;
//淇敼鏃堕棿
- private LocalDate updateTime;
+ private LocalDateTime updateTime;
//澶栭敭璁惧琛�
private Device device;
--
Gitblit v1.8.0