From 41ab7abd0b0ec0fefb03b60bbaf42c02fbda666b Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 23 四月 2026 15:53:16 +0800
Subject: [PATCH] feat(production): 添加生产订单与销售台账关联功能
---
src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java | 69 +++-------------------------------
1 files changed, 7 insertions(+), 62 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java b/src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java
index 8df1411..34b3086 100644
--- a/src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java
+++ b/src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java
@@ -1,70 +1,15 @@
package com.ruoyi.device.dto;
-
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import io.swagger.annotations.ApiModelProperty;
+import com.ruoyi.device.pojo.DeviceRepair;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
-import java.time.LocalDateTime;
-import java.util.Date;
-
@Data
-public class DeviceRepairDto {
+public class DeviceRepairDto extends DeviceRepair {
- @ApiModelProperty("璁惧鎶ヤ慨id")
- private Long id;
+ @Schema(description = "鎶ヤ慨鏃堕棿瀛楃涓�")
+ private String repairTimeStr;
- @ApiModelProperty("璁惧鍙拌处id")
- private String deviceLedgerId;
-
- @ApiModelProperty("璁惧鍚嶇О")
- private String deviceName;
-
- @ApiModelProperty("璁惧鍨嬪彿")
- private String deviceModel;
-
- @ApiModelProperty("鎶ヤ慨鏃堕棿")
- private Date repairTime;
-
- @ApiModelProperty("鎶ヤ慨浜�")
- private String repairName;
-
- @ApiModelProperty("鎶ヤ慨鍐呭")
- private String remark;
-
- @ApiModelProperty("缁翠慨浜�")
- private String maintenanceName;
-
- @ApiModelProperty("缁翠慨鏃堕棿")
- private Date maintenanceTime;
-
- @ApiModelProperty("缁翠慨缁撴灉")
- private String maintenanceResult;
-
- @ApiModelProperty("鐘舵��")
- private Integer status;
-
- @ApiModelProperty("鍒涘缓鏃堕棿")
- @TableField(fill = FieldFill.INSERT)
- private LocalDateTime createTime;
-
- @ApiModelProperty("鏇存柊鏃堕棿")
- @TableField(fill = FieldFill.UPDATE)
- private LocalDateTime updateTime;
-
- @ApiModelProperty("鍒涘缓浜�")
- @TableField(fill = FieldFill.INSERT)
- private String createUser;
-
- @ApiModelProperty("鏇存柊浜�")
- @TableField(fill = FieldFill.UPDATE)
- private String updateUser;
-
- @ApiModelProperty("绉熸埛id")
- @TableField(fill = FieldFill.INSERT)
- private Long tenantId;
-
-
+ @Schema(description = "缁翠慨鏃堕棿瀛楃涓�")
+ private String maintenanceTimeStr;
}
-
--
Gitblit v1.9.3