Merge remote-tracking branch 'origin/tdl_bosch' into tdl_bosch

src/main/resources/mapper/GatewayMapper.xml

@@ -139,7 +139,7 @@
         </select>
 
     <select id="getByGateway" resultType="com.example.tdl.domain.vo.AlarmNoVo"  parameterType="String">
-            select DISTINCT  g.useScene  mode, transportationNo, warehouseNo from gateway g INNER JOIN tdldevice t on  t.gateway_id = g.id
+            select DISTINCT  g.useScene  mode, transportationNo, warehouseNo, warehouseName from gateway g INNER JOIN tdldevice t on  t.gateway_id = g.id
             LEFT JOIN circuit c on  c.id = t.circuit_id
             LEFT JOIN warehouse w on w.id = t.warehouse_id
             where g.SN=#{SN,jdbcType=VARCHAR} and  g.type=#{type,jdbcType=VARCHAR}