From 99755eea33cf009c36507df468c244f3be5b34c9 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期五, 28 二月 2025 17:27:31 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/lims-ruoyi-after into dev_cr
---
cnas-device/src/main/java/com/ruoyi/device/pojo/DeviceDocuments.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/cnas-device/src/main/java/com/ruoyi/device/pojo/Document.java b/cnas-device/src/main/java/com/ruoyi/device/pojo/DeviceDocuments.java
similarity index 88%
rename from cnas-device/src/main/java/com/ruoyi/device/pojo/Document.java
rename to cnas-device/src/main/java/com/ruoyi/device/pojo/DeviceDocuments.java
index 25ab334..ae683e3 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/pojo/Document.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/pojo/DeviceDocuments.java
@@ -14,7 +14,7 @@
*/
@Data
@TableName(value = "device_documents")
-public class Document implements Serializable {
+public class DeviceDocuments implements Serializable {
private static final long serialVersionUID = 1L;
@@ -57,7 +57,6 @@
/**
* 鎻愪緵鏃ユ湡
*/
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime provideDate;
/**
@@ -68,18 +67,19 @@
/**
* 鍒涘缓鏃堕棿
*/
-
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@TableField(fill = FieldFill.INSERT_UPDATE)
- private LocalDateTime createdAt;
+ private LocalDateTime createTime;
/**
* 鏇存柊鏃堕棿
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@TableField(fill = FieldFill.INSERT_UPDATE)
- private LocalDateTime updatedAt;
+ private LocalDateTime updateTime;
- private int deviceId;
+ @ApiModelProperty("璁惧id")
+ private Integer deviceId;
@ApiModelProperty("璧勪骇缂栧彿")
private String number;
--
Gitblit v1.9.3