From 256f758a45c9b00a9248b02345ee1d6f52869e08 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期三, 05 十一月 2025 09:36:58 +0800
Subject: [PATCH] yys 1.导出接口开发 2.营销管理-回款登记-回款状态（回款完成，未完成） 3.采购管理-付款登记-加一个付款进度 4.采购管理-付款流水-采购合同号筛选 5.仓储物流-所有-查询条件加一个日期 6.仓储物流-入库管理-加一个库存预警数量字段 7.生产管控-生产订单-加一个订单状态-已完成、未完成 8.协同办公-通知公告-加一个时间限制，过时后状态改为已过期
---
src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java b/src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java
index dffcdd5..cae0715 100644
--- a/src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java
+++ b/src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java
@@ -5,6 +5,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.time.LocalDateTime;
import java.util.Date;
@Data
@@ -16,7 +17,7 @@
private Long id;
@ApiModelProperty("璁惧鍙拌处id")
- private String deviceLedgerId;
+ private Long deviceLedgerId;
@ApiModelProperty("璁惧鍚嶇О")
private String deviceName;
@@ -25,13 +26,19 @@
private String deviceModel;
@ApiModelProperty("璁″垝淇濆吇鏃ユ湡")
- private Date maintenancePlanTime;
+ private String maintenancePlanTimeReq;
+
+ @ApiModelProperty("璁″垝淇濆吇鏃ユ湡")
+ private LocalDateTime maintenancePlanTime;
@ApiModelProperty("瀹為檯淇濆吇浜�")
private String maintenanceActuallyName;
@ApiModelProperty("瀹為檯淇濆吇鏃ユ湡")
- private Date maintenanceActuallyTime;
+ private LocalDateTime maintenanceActuallyTime;
+
+ @ApiModelProperty("瀹為檯淇濆吇鏃ユ湡")
+ private String maintenanceActuallyTimeReq;
@ApiModelProperty("淇濆吇缁撴灉 0 缁翠慨 1 瀹屽ソ")
private Integer maintenanceResult;
@@ -41,11 +48,11 @@
@ApiModelProperty("鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
- private Date createTime;
+ private LocalDateTime createTime;
@ApiModelProperty("鏇存柊鏃堕棿")
@TableField(fill = FieldFill.UPDATE)
- private Date updateTime;
+ private LocalDateTime updateTime;
@ApiModelProperty("鍒涘缓浜�")
@TableField(fill = FieldFill.INSERT)
@@ -58,4 +65,7 @@
@ApiModelProperty("绉熸埛id")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+
+ @ApiModelProperty("鍒涘缓浜哄悕绉�")
+ private String createUserName;
}
--
Gitblit v1.9.3