From c9a5c5c9a57abee05470e958e4dc161809f73cf4 Mon Sep 17 00:00:00 2001
From: jiang <1354748262@qq.com>
Date: 星期五, 12 一月 2024 09:06:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 jcdm-ui/src/views/main/em/equipmentArchives/index.vue |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/jcdm-ui/src/views/main/em/equipmentArchives/index.vue b/jcdm-ui/src/views/main/em/equipmentArchives/index.vue
index c3dd8e1..db4bb36 100644
--- a/jcdm-ui/src/views/main/em/equipmentArchives/index.vue
+++ b/jcdm-ui/src/views/main/em/equipmentArchives/index.vue
@@ -217,7 +217,7 @@
         equipmentTypeName: null,
         workshopCode: null,
         lineCode: null,
-        processes: null,
+        processesCode: null,
         status: null,
         createUser: null,
         updateUser: null,
@@ -295,7 +295,7 @@
         equipmentTypeName: null,
         workshopCode: null,
         lineCode: null,
-        processes: null,
+        processesCode: null,
         status: null,
         remark: null,
         createUser: null,

--
Gitblit v1.9.3