Merge remote-tracking branch 'remotes/origin/dev-2.15.0' into dev

src/main/java/com/chinaitop/depot/basic/mapper/MonitorCameraMapper.xml

@@ -624,10 +624,12 @@
         nvr.factory nvr_factory,
         camera.channel_number,
         camera.org_id,
-        camera.camera_index_code cameraIndexCode
+        camera.camera_index_code cameraIndexCode,
+        s.storehouse_id storehouseId
       FROM
           monitor_camera camera
       LEFT JOIN monitor_nvr nvr ON nvr.id = camera.nvr_id
+      LEFT JOIN camera_storehouse s on s.camera_id = camera.id
       WHERE camera.isremove = '1' AND nvr.delete_mark = '1' AND camera.org_id = #{orgid,jdbcType=VARCHAR} AND nvr.org_id = #{orgid,jdbcType=VARCHAR}
     group by camera.id
   </select>