Merge remote-tracking branch 'origin/master'

Administrator

2021-12-06 0cabea1fb1196c666b6e676e0f3446815c4ae82f

 src/main/java/org/springblade/modules/equipage/mapper/EquipageMapper.xml

@@ -47,4 +47,13 @@
            and se.id = #{equipage.id}
        </if>
    </select>
    <select id="selectGun" resultType="java.util.HashMap">
        SELECT sg.*,
               bt.dept_name AS tenantName
        FROM sys_gun sg
                 LEFT JOIN
             blade_dept bt
             ON
                 sg.dept_id = bt.id
    </select>
</mapper>