From 1bbe6f787d58b768dce5370aa4e0d242c5e4b62d Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期二, 21 四月 2026 17:26:53 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro

---
 src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java b/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java
index c3b73ad..cbf8dbf 100644
--- a/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java
+++ b/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java
@@ -38,6 +38,9 @@
     @ApiModelProperty(value = "鏈�鍚庢墽琛屾椂闂�")
     private LocalDateTime lastExecutionTime;
 
+    @ApiModelProperty(value = "璁惧绫荤洰")
+    private String machineryCategory;
+
 
     private String deviceName;
 
@@ -98,4 +101,7 @@
         private Long id;
         private Integer quantity;
     }
+
+    @TableField(fill = FieldFill.INSERT)
+    private Long deptId;
 }

--
Gitblit v1.9.3