From eb23b15acb15aae43b336ecf5ffb2053bcf85464 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 09 九月 2025 18:05:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/model/TErpMaintenanceReminder.java | 8 +++++---
1 files changed, 5 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 c0850ab..e63f9d4 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
@@ -1,6 +1,7 @@
package com.ruoyi.system.model;
import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.domain.BaseModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -37,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")
@@ -50,6 +51,7 @@
private Integer maintenancePersonId;
@ApiModelProperty(value = "维护时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@TableField("maintenance_time")
private LocalDateTime maintenanceTime;
--
Gitblit v1.7.1