From 17cfbc75dc326f3e5963ee17c99d6516497f8cf1 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 26 Aug 2022 17:33:24 +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..2e4da29 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,machining_tp as processUrl
+ FROM `sys_machining`
+ WHERE is_deleted = 0
</select>
</mapper>
--
Gitblit v1.9.3