From b0d0191a88912b352385349461b500a4964d693b Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 19 九月 2025 22:51:24 +0800
Subject: [PATCH] 机床加字段
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/mapper/MachineMapper.xml | 7 +------
1 files changed, 1 insertions(+), 6 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/mapper/MachineMapper.xml b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/mapper/MachineMapper.xml
index fccffbc..f1a21be 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/mapper/MachineMapper.xml
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/mapper/MachineMapper.xml
@@ -14,7 +14,7 @@
<result column="is_deleted" property="isDeleted"/>
</resultMap>
<select id="pageQuery" resultType="org.springblade.mdm.basesetting.machine.vo.MachineVO">
- select m.id,m.name,m.code,g.dict_key machine_group_code,g.dict_value machine_group_name,m.machine_spec,msp.dict_value machine_spec_name
+ select m.id,m.name,m.code,m.equipment_code,g.dict_key machine_group_code,g.dict_value machine_group_name,m.machine_spec,msp.dict_value machine_spec_name
,d.dept_name owner_dept_name,s.dict_value control_system_name,m.manufacturer,m.operator,m.status
,prog_send_dir,prog_receive_dir,prog_temp_dir,m.remark,send_dir_expiry_hours,receive_dir_expiry_hours
from mdm_machine m
@@ -34,10 +34,5 @@
</if>
order by m.update_time desc,m.code asc
</select>
-
-
- <!-- <select id="parentTree" resultMap="treeNodeResultMap">-->
-<!-- select id, parent_id, dict_value as title, id as "value", id as "key" from blade_dict where is_deleted = 0 and parent_id = 0-->
-<!-- </select>-->
</mapper>
--
Gitblit v1.9.3