From 214ebdf7db3f56fce7826abe0f286326246125f6 Mon Sep 17 00:00:00 2001
From: 艾金辉 <1144154118@qq.com>
Date: 星期五, 21 七月 2023 15:10:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ard-work/src/main/java/com/ruoyi/alarm/steal/service/impl/IStealElecAlarmServiceImpl.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ard-work/src/main/java/com/ruoyi/alarm/stealAlarm/service/impl/IStealElecAlarmServiceImpl.java b/ard-work/src/main/java/com/ruoyi/alarm/steal/service/impl/IStealElecAlarmServiceImpl.java
similarity index 94%
rename from ard-work/src/main/java/com/ruoyi/alarm/stealAlarm/service/impl/IStealElecAlarmServiceImpl.java
rename to ard-work/src/main/java/com/ruoyi/alarm/steal/service/impl/IStealElecAlarmServiceImpl.java
index 481a931..183cc2b 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/stealAlarm/service/impl/IStealElecAlarmServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/steal/service/impl/IStealElecAlarmServiceImpl.java
@@ -1,13 +1,13 @@
-package com.ruoyi.alarm.stealAlarm.service.impl;
+package com.ruoyi.alarm.steal.service.impl;
 
 
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
-import com.ruoyi.alarm.stealAlarm.domain.ArdAlarmStealelec;
-import com.ruoyi.alarm.stealAlarm.service.IStealElecAlarmService;
+import com.ruoyi.alarm.steal.domain.ArdAlarmStealelec;
+import com.ruoyi.alarm.steal.service.IStealElecAlarmService;
 import com.ruoyi.alarmpoints.well.domain.ArdAlarmpointsWell;
 import com.ruoyi.alarmpoints.well.mapper.ArdAlarmpointsWellMapper;
-import com.ruoyi.alarm.stealAlarm.mapper.ArdAlarmStealelecMapper;
+import com.ruoyi.alarm.steal.mapper.ArdAlarmStealelecMapper;
 import com.ruoyi.system.service.ISysConfigService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

--
Gitblit v1.9.3