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

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

@@ -623,7 +623,8 @@
         nvr. PORT nvr_port,
         nvr.factory nvr_factory,
         camera.channel_number,
-        camera.org_id
+        camera.org_id,
+        camera.camera_index_code cameraIndexCode
       FROM
           monitor_camera camera
       LEFT JOIN monitor_nvr nvr ON nvr.id = camera.nvr_id