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

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

@@ -131,8 +131,7 @@ async function alarmList(ctx, agg) {
                         RIGHT JOIN ${anxinyun}.t_video_ipc
                            ON toString(${anxinyun}.t_video_ipc.channel_no) = camera_status_alarm.channel_no
                            AND ${anxinyun}.t_video_ipc.serial_no = camera_status_alarm.serial_no
-                           ${`WHERE ${anxinyun}.t_video_ipc.structure IN (${anxinStrucIds.join(',')})`
-         }
+                           ${`WHERE ${anxinyun}.t_video_ipc.structure IN (${anxinStrucIds.join(',')})`}
                      )
                      ${limit ? 'LIMIT ' + limit : ''}
                      ${limit && page ? 'OFFSET ' + parseInt(limit) * parseInt(page) : ''}