Procházet zdrojové kódy

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

gaodd před 1 rokem
rodič
revize
bd76c3c158

+ 2 - 1
src/main/java/com/chinaitop/depot/basic/mapper/MonitorCameraMapper.xml

@@ -623,7 +623,8 @@
623
         nvr. PORT nvr_port,
623
         nvr. PORT nvr_port,
624
         nvr.factory nvr_factory,
624
         nvr.factory nvr_factory,
625
         camera.channel_number,
625
         camera.channel_number,
626
-        camera.org_id
626
+        camera.org_id,
627
+        camera.camera_index_code cameraIndexCode
627
       FROM
628
       FROM
628
           monitor_camera camera
629
           monitor_camera camera
629
       LEFT JOIN monitor_nvr nvr ON nvr.id = camera.nvr_id
630
       LEFT JOIN monitor_nvr nvr ON nvr.id = camera.nvr_id