Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

云

2026-04-22 f5fec3e27510969ee9f2fc89d2e1e2868d25f1f1

 src/main/java/com/ruoyi/framework/security/service/SysLoginService.java

@@ -1,6 +1,6 @@
package com.ruoyi.framework.security.service;



import javax.annotation.Resource;

import jakarta.annotation.Resource;



import com.ruoyi.framework.web.domain.AjaxResult;

import com.ruoyi.project.system.mapper.SysUserMapper;