From 24f97b8c8187e1f25e777934a70cf1719333e20a Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期六, 25 四月 2026 14:00:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_NEW_pro' into dev_NEW_pro

---
 src/views/equipmentManagement/upkeep/index.vue |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/src/views/equipmentManagement/upkeep/index.vue b/src/views/equipmentManagement/upkeep/index.vue
index 543e37b..1e65663 100644
--- a/src/views/equipmentManagement/upkeep/index.vue
+++ b/src/views/equipmentManagement/upkeep/index.vue
@@ -372,6 +372,11 @@
 		align: "center",
 		prop: "createUserName",
 	},
+  {
+    label: "绫荤洰",
+    align: "center",
+    prop: "machineryCategory",
+  },
 	// {
 	//   label: "褰曞叆鏃ユ湡",
 	//   align: "center",

--
Gitblit v1.9.3