From 6436cc92fb7d0b0d5a95472920a951b9ab1fee78 Mon Sep 17 00:00:00 2001 From: wcy <761646706@qq.com> Date: Tue, 10 Sep 2024 15:32:17 +0800 Subject: [PATCH] =?UTF-8?q?intelligentCode=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/base/MaMachineTypeMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaMachineTypeMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaMachineTypeMapper.xml index aeb51f5..a40302b 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaMachineTypeMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaMachineTypeMapper.xml @@ -342,7 +342,7 @@ m.holding_time, m.warn_num, mtf.file_name photoName, mtf.file_url photoUrl, mtf2.file_name documentName, mtf2.file_url documentUrl, mtk.user_id keeperUserId, su.nick_name keeperUserName, mpi.prop_name, m.del_flag, m.create_by, m.create_time, - m.remark, m.company_id,m.fac_model as facModel,m.machine_code + m.remark, m.company_id,m.fac_model as facModel,m.intelligent_code from ma_type m left join ma_prop_set mps on m.type_id = mps.type_id left join ma_prop_info mpi on mps.prop_id = mpi.prop_id