From f5fec3e27510969ee9f2fc89d2e1e2868d25f1f1 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 22 四月 2026 09:36:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/device/pojo/DeviceRepair.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/pojo/DeviceRepair.java b/src/main/java/com/ruoyi/device/pojo/DeviceRepair.java
index 055a724..7beedee 100644
--- a/src/main/java/com/ruoyi/device/pojo/DeviceRepair.java
+++ b/src/main/java/com/ruoyi/device/pojo/DeviceRepair.java
@@ -34,6 +34,10 @@
@ApiModelProperty("鎶ヤ慨鍐呭")
private String remark;
+
+ @ApiModelProperty(value = "璁惧绫荤洰")
+ private String machineryCategory;
+
@ApiModelProperty("缁翠慨浜�")
private String maintenanceName;
@@ -85,4 +89,7 @@
private Long id;
private Integer quantity;
}
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
--
Gitblit v1.9.3