From e2aa651db9f17d58819329de571037edc0f9eba2 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期一, 23 六月 2025 18:13:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/ruoyi/device/pojo/DeviceRepair.java | 40 +++++++++++++++++++++++-----------------
1 files changed, 23 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/pojo/DeviceRepair.java b/src/main/java/com/ruoyi/device/pojo/DeviceRepair.java
index 3d68c65..b493cd4 100644
--- a/src/main/java/com/ruoyi/device/pojo/DeviceRepair.java
+++ b/src/main/java/com/ruoyi/device/pojo/DeviceRepair.java
@@ -3,12 +3,15 @@
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import nonapi.io.github.classgraph.json.Id;
+import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
+import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.Date;
@@ -16,53 +19,56 @@
@TableName("device_repair")
public class DeviceRepair {
+ @ApiModelProperty("璁惧鎶ヤ慨id")
private Long id;
- @TableField(value = "device_ledger_id")
@ApiModelProperty("璁惧鍙拌处id")
private String deviceLedgerId;
- @TableField(value = "repair_time")
- @ApiModelProperty("缁翠慨鏃堕棿")
+ @ApiModelProperty("鎶ヤ慨鏃堕棿")
private Date repairTime;
- @TableField(value = "repair_name")
- @ApiModelProperty("缁翠慨浜�")
+ @ApiModelProperty("鎶ヤ慨浜�")
private String repairName;
- @TableField(value = "remark")
- @ApiModelProperty("澶囨敞")
+ @ApiModelProperty("鎶ヤ慨鍐呭")
private String remark;
- @TableField(value = "maintenance_name")
@ApiModelProperty("缁翠慨浜�")
private String maintenanceName;
- @TableField(value = "maintenance_time")
@ApiModelProperty("缁翠慨鏃堕棿")
- private LocalDateTime maintenanceTime;
+ private Date maintenanceTime;
- @TableField(value = "maintenance_result")
@ApiModelProperty("缁翠慨缁撴灉")
private String maintenanceResult;
- @ApiModelProperty("鐘舵��")
+ @ApiModelProperty("鐘舵�� 0 寰呯淮淇� 1瀹岀粨")
private Integer status;
- @TableField(value = "create_time" ,fill = FieldFill.INSERT)
@ApiModelProperty("鍒涘缓鏃堕棿")
+ @TableField(fill = FieldFill.INSERT)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
- @ApiModelProperty("淇敼鏃堕棿")
+ @ApiModelProperty("鏇存柊鏃堕棿")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime;
@ApiModelProperty("鍒涘缓浜�")
- private String createUser;
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
- @ApiModelProperty("淇敼浜�")
- private String updateUser;
+ @ApiModelProperty("鏇存柊浜�")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Integer updateUser;
@ApiModelProperty("绉熸埛id")
+ @TableField(fill = FieldFill.INSERT)
private Long tenantId;
+
}
--
Gitblit v1.9.3