diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/entity/SysEmail.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/SysEmail.java similarity index 97% rename from jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/entity/SysEmail.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/SysEmail.java index 32def11e..3ab7ba01 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/entity/SysEmail.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/SysEmail.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.entity; +package org.jeecg.modules.base.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/entity/SysEmailLog.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/SysEmailLog.java similarity index 97% rename from jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/entity/SysEmailLog.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/SysEmailLog.java index d1d677ff..3d29f926 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/entity/SysEmailLog.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/SysEmailLog.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.entity; +package org.jeecg.modules.base.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/SysEmailController.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/SysEmailController.java index 78fdd27c..cc5bc3fa 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/SysEmailController.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/SysEmailController.java @@ -4,7 +4,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.jeecg.common.api.QueryRequest; import org.jeecg.common.api.vo.Result; -import org.jeecg.modules.entity.SysEmail; +import org.jeecg.modules.base.entity.SysEmail; import org.jeecg.modules.service.ISysEmailService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.format.annotation.DateTimeFormat; diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/SysEmailLogMapper.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/SysEmailLogMapper.java index 49f5317b..fb25392b 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/SysEmailLogMapper.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/SysEmailLogMapper.java @@ -1,7 +1,7 @@ package org.jeecg.modules.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.jeecg.modules.entity.SysEmailLog; +import org.jeecg.modules.base.entity.SysEmailLog; public interface SysEmailLogMapper extends BaseMapper { } diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/SysEmailMapper.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/SysEmailMapper.java index ed46c7d8..69ea7234 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/SysEmailMapper.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/SysEmailMapper.java @@ -3,7 +3,7 @@ package org.jeecg.modules.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; import org.jeecg.modules.entity.AlarmHistory; -import org.jeecg.modules.entity.SysEmail; +import org.jeecg.modules.base.entity.SysEmail; import java.util.Date; import java.util.List; diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/ISysEmailLogService.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/ISysEmailLogService.java index 33ebea2b..1b2816ef 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/ISysEmailLogService.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/ISysEmailLogService.java @@ -1,7 +1,7 @@ package org.jeecg.modules.service; import com.baomidou.mybatisplus.extension.service.IService; -import org.jeecg.modules.entity.SysEmailLog; +import org.jeecg.modules.base.entity.SysEmailLog; public interface ISysEmailLogService extends IService { } diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/ISysEmailService.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/ISysEmailService.java index 6e34062e..4253a0fc 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/ISysEmailService.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/ISysEmailService.java @@ -3,7 +3,7 @@ package org.jeecg.modules.service; import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.common.api.QueryRequest; import org.jeecg.common.api.vo.Result; -import org.jeecg.modules.entity.SysEmail; +import org.jeecg.modules.base.entity.SysEmail; import java.util.Date; diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysEmailLogServiceImpl.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysEmailLogServiceImpl.java index 6df2a581..06e9cb66 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysEmailLogServiceImpl.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysEmailLogServiceImpl.java @@ -1,7 +1,7 @@ package org.jeecg.modules.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.jeecg.modules.entity.SysEmailLog; +import org.jeecg.modules.base.entity.SysEmailLog; import org.jeecg.modules.mapper.SysEmailLogMapper; import org.jeecg.modules.service.ISysEmailLogService; import org.springframework.stereotype.Service; diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysEmailServiceImpl.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysEmailServiceImpl.java index 32639935..e8bb086e 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysEmailServiceImpl.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysEmailServiceImpl.java @@ -10,7 +10,7 @@ import org.jeecg.common.system.util.JwtUtil; import org.jeecg.common.util.DateUtils; import org.jeecg.common.util.SpringContextUtils; import org.jeecg.modules.entity.AlarmHistory; -import org.jeecg.modules.entity.SysEmail; +import org.jeecg.modules.base.entity.SysEmail; import org.jeecg.modules.mapper.SysEmailMapper; import org.jeecg.modules.service.ISysEmailService; import org.springframework.stereotype.Service;