From 40924e921f1a67c09ca808994c03ca5165993450 Mon Sep 17 00:00:00 2001
From: zenghongyao <873884283@qq.com>
Date: Sat, 19 Apr 2025 13:57:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BasicScheduledMeterReadingService.cs                     | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/services/JiShe.CollectBus.Application/ScheduledMeterReading/BasicScheduledMeterReadingService.cs b/services/JiShe.CollectBus.Application/ScheduledMeterReading/BasicScheduledMeterReadingService.cs
index 1ab07bc..1cc3c2b 100644
--- a/services/JiShe.CollectBus.Application/ScheduledMeterReading/BasicScheduledMeterReadingService.cs
+++ b/services/JiShe.CollectBus.Application/ScheduledMeterReading/BasicScheduledMeterReadingService.cs
@@ -27,11 +27,6 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using static FreeSql.Internal.GlobalFilter;
-<<<<<<< HEAD
-using JiShe.CollectBus.Kafka.Internal;
-=======
-using static System.Runtime.InteropServices.JavaScript.JSType;
->>>>>>> fe51402b1f105dc536f08ec2249d4ab13fa8f172
 
 namespace JiShe.CollectBus.ScheduledMeterReading
 {