代码提交

services/JiShe.CollectBus.Application/Samples/SampleAppService.cs

@@ -26,11 +26,8 @@ using System.Diagnostics;
 using JiShe.CollectBus.IoTDB.Context;
 using JiShe.CollectBus.IoTDB.Interface;
 using JiShe.CollectBus.IoTDB.Options;
-<<<<<<< HEAD
 using JiShe.CollectBus.Kafka.Internal;
-=======
 using JiShe.CollectBus.Common.Extensions;
->>>>>>> fe51402b1f105dc536f08ec2249d4ab13fa8f172
 
 namespace JiShe.CollectBus.Samples;
 

services/JiShe.CollectBus.Application/ScheduledMeterReading/BasicScheduledMeterReadingService.cs

@@ -13,6 +13,7 @@ using JiShe.CollectBus.IoTDB.Interface;
 using JiShe.CollectBus.IotSystems.MessageIssueds;
 using JiShe.CollectBus.IotSystems.MeterReadingRecords;
 using JiShe.CollectBus.IotSystems.Watermeter;
+using JiShe.CollectBus.Kafka.Internal;
 using JiShe.CollectBus.Kafka.Producer;
 using JiShe.CollectBus.Protocol.Contracts;
 using JiShe.CollectBus.RedisDataCache;
@@ -27,11 +28,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
 {