Merge branch 'dev_trial' of https://gitea.anxinyun.cn/free-sun/FS-IOT into dev_trial

3 years ago · 0ed05daa6e
4 changed files with 1 additions and 0 deletions
--- a/code/VideoAccess-VCMP/api/app/lib/controllers/camera/index.js
+++ b/code/VideoAccess-VCMP/api/app/lib/controllers/camera/index.js
@ -265,6 +265,7 @@ async function getCameraListAll (ctx) {

      const cameraRes = await models.Camera.findAll({
         attributes: { exclude: ['delete', 'recycleTime', 'rtmp', 'createUserId', 'nvrId', 'kindId', 'yingshiSecretId', 'gbId'] },
+         order: [['id', 'DESC']],
         where: {
            delete: false,
            recycleTime: null,
--- a/code/VideoAccess-VCMP/script/1.3.1/data/1_sync_camera_data/.vscode/launch.json
+++ b/code/VideoAccess-VCMP/script/1.3.1/data/1_sync_camera_data/.vscode/launch.json
--- a/code/VideoAccess-VCMP/script/1.3.1/data/1_sync_camera_data/index.js
+++ b/code/VideoAccess-VCMP/script/1.3.1/data/1_sync_camera_data/index.js
--- a/code/VideoAccess-VCMP/script/1.3.1/data/1_sync_camera_data/package.json
+++ b/code/VideoAccess-VCMP/script/1.3.1/data/1_sync_camera_data/package.json