优化

2 years ago · 3a67f2b188
parent b64ae957ba
commit 3a67f2b188
1 changed files with 0 additions and 4 deletions
--- a/src/views/management/monitoringEquipment/photographicDevice/components/runStatus.vue
+++ b/src/views/management/monitoringEquipment/photographicDevice/components/runStatus.vue
@ -180,7 +180,6 @@ export default {
  },
 };
 </script>
-<<<<<<< HEAD
 <style lang="less">
 .runStatusDialog {
  .pageNation {
@ -195,6 +194,3 @@ export default {
  }
 }
 </style>
-=======
-<style lang="less" scoped></style>
->>>>>>> hn1.0