From 0cabea1fb1196c666b6e676e0f3446815c4ae82f Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 06 Dec 2021 11:09:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/equipage/mapper/EquipageMapper.xml | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/equipage/mapper/EquipageMapper.xml b/src/main/java/org/springblade/modules/equipage/mapper/EquipageMapper.xml
index 77272ce..bc2beaa 100644
--- a/src/main/java/org/springblade/modules/equipage/mapper/EquipageMapper.xml
+++ b/src/main/java/org/springblade/modules/equipage/mapper/EquipageMapper.xml
@@ -48,6 +48,12 @@
</if>
</select>
<select id="selectGun" resultType="java.util.HashMap">
- SELECT * FROM `sys_gun`
+ SELECT sg.*,
+ bt.dept_name AS tenantName
+ FROM sys_gun sg
+ LEFT JOIN
+ blade_dept bt
+ ON
+ sg.dept_id = bt.id
</select>
</mapper>
--
Gitblit v1.9.3