From 06ea0fe23faf2238d9d1141826ecb404367aecec Mon Sep 17 00:00:00 2001 From: luodangjia <luodangjia> Date: 星期五, 18 十月 2024 10:49:38 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLoginLogServiceImpl.java | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLoginLogServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLoginLogServiceImpl.java index 69d7b95..afe491d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLoginLogServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLoginLogServiceImpl.java @@ -5,8 +5,8 @@ import com.ruoyi.common.core.web.domain.AjaxResult; import com.ruoyi.common.core.web.page.BasePage; import com.ruoyi.common.core.web.page.PageInfo; +import com.ruoyi.system.api.domain.SysLoginLog; import com.ruoyi.system.api.domain.SysUser; -import com.ruoyi.system.domain.SysLoginLog; import com.ruoyi.system.mapper.SysLoginLogMapper; import com.ruoyi.system.service.ISysLoginLogService; import com.ruoyi.system.service.ISysUserService; @@ -14,7 +14,6 @@ import javax.annotation.Resource; import java.time.LocalDateTime; -import java.util.Date; import java.util.List; /** -- Gitblit v1.7.1