解决冲突

ZZJ

2021-10-13 4d010f1940db29c1effc0f9bd6a975436c1183d9

 src/pages/cameraAccess/components/SceneRule.vue

@@ -156,7 +156,6 @@
<script>
import {
  saveCameraScene,
  getCameraSceneRule,
  deleteCameraScene
} from '@/api/scene'
import RuleEditor from "@/components/subComponents/RuleEditor";