From a9780c49f8cf587af26cc83d439320ad02b8668f Mon Sep 17 00:00:00 2001 From: zhaowenyu <35589726@qq.com> Date: Wed, 15 Oct 2025 09:17:13 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev --- ard-system/src/main/java/com/ard/system/system/service/impl/SysRoleServiceImpl.java | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ard-system/src/main/java/com/ard/system/service/system/impl/SysRoleServiceImpl.java b/ard-system/src/main/java/com/ard/system/system/service/impl/SysRoleServiceImpl.java similarity index 95% rename from ard-system/src/main/java/com/ard/system/service/system/impl/SysRoleServiceImpl.java rename to ard-system/src/main/java/com/ard/system/system/service/impl/SysRoleServiceImpl.java index 50a9e49..9bba1b9 100644 --- a/ard-system/src/main/java/com/ard/system/service/system/impl/SysRoleServiceImpl.java +++ b/ard-system/src/main/java/com/ard/system/system/service/impl/SysRoleServiceImpl.java @@ -1,4 +1,4 @@ -package com.ard.system.service.system.impl; +package com.ard.system.system.service.impl; import java.util.ArrayList; import java.util.Arrays; @@ -6,7 +6,7 @@ import java.util.List; import java.util.Set; -import com.ard.system.service.system.ISysRoleService; +import com.ard.system.system.service.ISysRoleService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -18,13 +18,13 @@ import com.ard.common.utils.SecurityUtils; import com.ard.common.utils.StringUtils; import com.ard.common.utils.spring.SpringUtils; -import com.ard.system.domain.system.SysRoleDept; -import com.ard.system.domain.system.SysRoleMenu; -import com.ard.system.domain.system.SysUserRole; -import com.ard.system.mapper.system.SysRoleDeptMapper; -import com.ard.system.mapper.system.SysRoleMapper; -import com.ard.system.mapper.system.SysRoleMenuMapper; -import com.ard.system.mapper.system.SysUserRoleMapper; +import com.ard.system.system.domain.SysRoleDept; +import com.ard.system.system.domain.SysRoleMenu; +import com.ard.system.system.domain.SysUserRole; +import com.ard.system.system.mapper.SysRoleDeptMapper; +import com.ard.system.system.mapper.SysRoleMapper; +import com.ard.system.system.mapper.SysRoleMenuMapper; +import com.ard.system.system.mapper.SysUserRoleMapper; /** * 角色 业务层处理 -- Gitblit v1.9.3