Merge branch 'dev' into pre-production

blade-service/logpm-report/src/main/java/com/logpm/report/mapper/largeScreen/MapWarehouseMapper.xml

@@ -10,6 +10,7 @@
         latitude as lat,
         longitude as lng
         from logpm_platform.logpm_warehouse_warehouse
+        where is_deleted=0 and name!='职能中心仓' and latitude is not null
     </select>
     <select id="lineInfolist" resultType="com.logpm.report.vo.largeScreen.MapWarehouse.LineInfoVO">
         select