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 | 6 +++---
1 files changed, 3 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..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
@@ -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")
--
Gitblit v1.7.1