From 34e64f1437ed897056bed0c3851e7a46ac220423 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 18 九月 2025 18:01:57 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/haizhentong
---
ruoyi-system/src/main/java/com/ruoyi/system/model/TErpMaintenanceReminder.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpMaintenanceReminder.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpMaintenanceReminder.java
index d4f56a2..ff53b79 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpMaintenanceReminder.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpMaintenanceReminder.java
@@ -38,9 +38,9 @@
@TableField("maintenance_type")
private Integer maintenanceType;
- @ApiModelProperty(value = "入库id")
- @TableField("warehousing_id")
- private String warehousingId;
+ @ApiModelProperty(value = "入库批次id")
+ @TableField("warehousing_batch_id")
+ private String warehousingBatchId;
@ApiModelProperty(value = "状态 1=未维护 2=已维护")
@TableField("status")
@@ -59,5 +59,10 @@
@TableField("maintenance_record")
private String maintenanceRecord;
+ @ApiModelProperty(value = "维护完成时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField("success_time")
+ private LocalDateTime successTime;
+
}
--
Gitblit v1.7.1