From 17bed3a7f7e90b23afb5def223fd7a285ff6cc24 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Tue, 10 Aug 2021 08:40:56 +0800
Subject: [PATCH] 冲突

---
 src/views/realTimePolice/real.vue |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/src/views/realTimePolice/real.vue b/src/views/realTimePolice/real.vue
index 4e13817..1d7bcd8 100644
--- a/src/views/realTimePolice/real.vue
+++ b/src/views/realTimePolice/real.vue
@@ -780,7 +780,6 @@
             };
           }
         }
-
         if (releaseTimeRange) {
           values = {
             ...params,

--
Gitblit v1.9.3