From 6d7633051dc592f80b7967e34fa6e34f340f899d Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Mon, 18 Jul 2022 15:16:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/machining/mapper/MachiningMapper.xml | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/machining/mapper/MachiningMapper.xml b/src/main/java/org/springblade/modules/machining/mapper/MachiningMapper.xml
index 169adf9..8a187ca 100644
--- a/src/main/java/org/springblade/modules/machining/mapper/MachiningMapper.xml
+++ b/src/main/java/org/springblade/modules/machining/mapper/MachiningMapper.xml
@@ -20,7 +20,15 @@
<select id="selectMachiningPage" resultMap="machiningResultMap">
- select * from sys_machining where is_deleted = 0
+ select *
+ from sys_machining
+ where is_deleted = 0
+ </select>
+
+ <select id="selectInfo" resultType="java.util.HashMap">
+ SELECT id as processId, machining_type as processName
+ FROM `sys_machining`
+ WHERE is_deleted = 0
</select>
</mapper>
--
Gitblit v1.9.3