From a1454f4b28db363ca4c4a6ea182d3aab95dc9518 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 24 四月 2026 11:17:50 +0800
Subject: [PATCH] fix(sales): 修正新增销售订单下发生产计划
---
src/main/java/com/ruoyi/device/execl/DeviceRepairExeclDto.java | 36 +++++++++++++++++-------------------
1 files changed, 17 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/execl/DeviceRepairExeclDto.java b/src/main/java/com/ruoyi/device/execl/DeviceRepairExeclDto.java
index 958db15..7e0a580 100644
--- a/src/main/java/com/ruoyi/device/execl/DeviceRepairExeclDto.java
+++ b/src/main/java/com/ruoyi/device/execl/DeviceRepairExeclDto.java
@@ -1,10 +1,8 @@
package com.ruoyi.device.execl;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.time.LocalDateTime;
@@ -13,48 +11,48 @@
@Data
public class DeviceRepairExeclDto {
- @ApiModelProperty("璁惧鍚嶇О")
+ @Schema(description = "璁惧鍚嶇О")
@Excel(name = "璁惧鍚嶇О")
private String deviceName;
- @ApiModelProperty("璁惧鍨嬪彿")
+ @Schema(description = "璁惧鍨嬪彿")
@Excel(name = "璁惧鍨嬪彿")
private String deviceModel;
- @ApiModelProperty("鎶ヤ慨鏃堕棿")
- @Excel(name = "鎶ヤ慨鏃堕棿")
+ @Schema(description = "鎶ヤ慨鏃堕棿")
+ @Excel(name = "鎶ヤ慨鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
private Date repairTime;
- @ApiModelProperty("鎶ヤ慨浜�")
+ @Schema(description = "鎶ヤ慨浜�")
@Excel(name = "鎶ヤ慨浜�")
private String repairName;
- @ApiModelProperty("鎶ヤ慨鍐呭")
+ @Schema(description = "鎶ヤ慨鍐呭")
@Excel(name = "鎶ヤ慨鍐呭")
private String remark;
- @ApiModelProperty("缁翠慨浜�")
+ @Schema(description = "缁翠慨浜�")
@Excel(name = "缁翠慨浜�")
private String maintenanceName;
- @ApiModelProperty("缁翠慨鏃堕棿")
- @Excel(name = "缁翠慨鏃堕棿")
- private Date maintenanceTime;
+ @Schema(description = "缁翠慨鏃堕棿")
+ @Excel(name = "缁翠慨鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
+ private LocalDateTime maintenanceTime;
- @ApiModelProperty("缁翠慨缁撴灉")
+ @Schema(description = "缁翠慨缁撴灉")
@Excel(name = "缁翠慨缁撴灉")
private String maintenanceResult;
- @ApiModelProperty("鐘舵��")
+ @Schema(description = "鐘舵��")
@Excel(name = "鐘舵��")
private String statusStr;
- @ApiModelProperty("鍒涘缓鏃堕棿")
- @Excel(name = "褰曞叆鏃堕棿")
+ @Schema(description = "鍒涘缓鏃堕棿")
+ @Excel(name = "褰曞叆鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
private LocalDateTime createTime;
- @Excel(name = "褰曞叆浜�")
- @ApiModelProperty("鍒涘缓浜�")
+// @Excel(name = "褰曞叆浜�")
+ @Schema(description = "鍒涘缓浜�")
private String createUser;
--
Gitblit v1.9.3