Merge branch 'dev' of https://gitea.anxinyun.cn/gao.zhiyuan/OperationalService into dev

api/app/lib/controllers/alarm/video.js

@@ -120,7 +120,7 @@ async function alarmList (ctx) {
                         camera_status_alarm.confirm_time AS confirmTime
                      
                      FROM camera_status_alarm
-                     LEFT JOIN camera
+                     INNER JOIN camera
                         ON camera.serial_no = camera_status_alarm.serial_no
                         AND camera.channel_no = camera_status_alarm.channel_no
                         ${cameraWhereOption.length ? 'AND ' + cameraWhereOption.join(' AND ') : ''}