From 27f5dec30ee350fa31b1a0b8aaffc11ba0423e28 Mon Sep 17 00:00:00 2001
From: ZZJ <zzjdsg2300@163.com>
Date: 星期四, 27 一月 2022 14:08:29 +0800
Subject: [PATCH] 冲突解决
---
src/pages/cameraAccess/components/SceneRule.vue | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/src/pages/cameraAccess/components/SceneRule.vue b/src/pages/cameraAccess/components/SceneRule.vue
index e27037b..3126c17 100644
--- a/src/pages/cameraAccess/components/SceneRule.vue
+++ b/src/pages/cameraAccess/components/SceneRule.vue
@@ -156,7 +156,6 @@
<script>
import {
saveCameraScene,
- getCameraSceneRule,
deleteCameraScene
} from '@/api/scene'
import RuleEditor from "@/components/subComponents/RuleEditor";
--
Gitblit v1.8.0