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-main/src/main/resources/mapper/em/equipmentArchives/EmEquipmentArchivesMapper.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/jcdm-main/src/main/resources/mapper/em/equipmentArchives/EmEquipmentArchivesMapper.xml b/jcdm-main/src/main/resources/mapper/em/equipmentArchives/EmEquipmentArchivesMapper.xml
index 33af1f1..43292df 100644
--- a/jcdm-main/src/main/resources/mapper/em/equipmentArchives/EmEquipmentArchivesMapper.xml
+++ b/jcdm-main/src/main/resources/mapper/em/equipmentArchives/EmEquipmentArchivesMapper.xml
@@ -29,7 +29,7 @@
</resultMap>
<sql id="selectEmEquipmentArchivesVo">
- select id, equipment_code, equipment_name, equipment_brand, equipment_spec, equipment_type_id, equipment_type_code, equipment_type_name, workshop_code, line_code, processes, status, remark, create_user, create_time, update_user, update_time, spare_field_1, spare_field_2, spare_field_3, spare_field_4 from em_equipment_archives
+ select id, equipment_code, equipment_name, equipment_brand, equipment_spec, equipment_type_id, equipment_type_code, equipment_type_name, workshop_code, line_code, processes_code, status, remark, create_user, create_time, update_user, update_time, spare_field_1, spare_field_2, spare_field_3, spare_field_4 from em_equipment_archives
</sql>
<select id="selectEmEquipmentArchivesList" parameterType="EmEquipmentArchives" resultMap="EmEquipmentArchivesResult">
--
Gitblit v1.9.3