From c079740238642c0e0b7897917584b1a523097fbe Mon Sep 17 00:00:00 2001
From: "gao.zhiyuan" <gao.zhiyuan@free-sun.com.cn>
Date: Wed, 6 Jul 2022 21:03:30 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=86=E9=A2=91=E5=A4=87=E6=B3=A8=20100%?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/app/lib/controllers/camera/index.js                 | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/code/VideoAccess-VCMP/api/app/lib/controllers/camera/index.js b/code/VideoAccess-VCMP/api/app/lib/controllers/camera/index.js
index 2c50b27..7a0cb8a 100644
--- a/code/VideoAccess-VCMP/api/app/lib/controllers/camera/index.js
+++ b/code/VideoAccess-VCMP/api/app/lib/controllers/camera/index.js
@@ -187,6 +187,12 @@ async function getCamera (ctx) {
             model: models.GbCamera,
             attributes: ['id', 'online', 'playUrl'],
             required: false
+         }, {
+            model: models.CameraRemark,
+            attributes: ['remark'],
+            order: [
+               ['id', 'DESC']
+            ],
          }]
       })