From 28cf22aaff7f092256db2ad6df699e17426f62ea Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期四, 30 四月 2026 16:34:27 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro
---
src/main/java/com/ruoyi/device/pojo/DeviceDefectRecord.java | 25 ++++++++++++++-----------
1 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/pojo/DeviceDefectRecord.java b/src/main/java/com/ruoyi/device/pojo/DeviceDefectRecord.java
index 966b8ae..f188b35 100644
--- a/src/main/java/com/ruoyi/device/pojo/DeviceDefectRecord.java
+++ b/src/main/java/com/ruoyi/device/pojo/DeviceDefectRecord.java
@@ -4,7 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -13,39 +13,42 @@
@Data
@TableName("device_defect_record")
public class DeviceDefectRecord {
- @ApiModelProperty("璁惧缂洪櫡璁板綍id")
+ @Schema(description = "璁惧缂洪櫡璁板綍id")
private Long id;
- @ApiModelProperty("璁惧鍙拌处id")
+ @Schema(description = "璁惧鍙拌处id")
private Long deviceLedgerId;
- @ApiModelProperty("缂洪櫡鎻忚堪")
+ @Schema(description = "缂洪櫡鎻忚堪")
private String defectDescription;
- @ApiModelProperty("鐘舵��")
+ @Schema(description = "鐘舵��")
private String status;
- @ApiModelProperty("娑堥櫎鏃堕棿")
+ @Schema(description = "娑堥櫎鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime eliminateTime;
- @ApiModelProperty("鍒涘缓鏃堕棿")
+ @Schema(description = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
- @ApiModelProperty("鏇存柊鏃堕棿")
+ @Schema(description = "鏇存柊鏃堕棿")
@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("鍒涘缓浜�")
+ @Schema(description = "鍒涘缓浜�")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
- @ApiModelProperty("鏇存柊浜�")
+ @Schema(description = "鏇存柊浜�")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Integer updateUser;
- @ApiModelProperty("绉熸埛id")
+ @Schema(description = "绉熸埛id")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
--
Gitblit v1.9.3