fix bug

src/views/system/dashboard/components/new-home.vue

@@ -329,11 +329,7 @@
             this.timer = setInterval(() => {
                 // this.getMessage()
                 this.getData(this.activeTab)
-<<<<<<< HEAD
             }, 30 * 1000)
-=======
-            }, 10 * 1000)
->>>>>>> 635b8f8d0851f08a4b8fe9b86700e24590f2e804
         },
         beforeDestroy() {
             clearInterval(this.timer)