From f8d30932873605f5eb407228b22a38ec5ff96af9 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期五, 12 九月 2025 15:57:28 +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 |    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