~nishiwei/ard-uav-server.git

倪世伟 / ard-uav-server

forked from uav/ard-uav-server

summary
reflog
commits
tree
docs
forks
compare

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

zhaowenyu

2025-10-14 f905f4377db462640a4fdd53dc5daa1adfc8c542

 ard-framework/src/main/java/com/ard/framework/web/service/SysPermissionService.java

@@ -10,8 +10,8 @@
import com.ard.common.core.domain.entity.SysRole;
import com.ard.common.core.domain.entity.SysUser;
import com.ard.common.utils.StringUtils;
import com.ard.system.service.ISysMenuService;
import com.ard.system.service.ISysRoleService;
import com.ard.system.service.system.ISysMenuService;
import com.ard.system.service.system.ISysRoleService;

/**
 * 用户权限处理

			@@ -10,8 +10,8 @@
			import com.ard.common.core.domain.entity.SysRole;
			import com.ard.common.core.domain.entity.SysUser;
			import com.ard.common.utils.StringUtils;
			import com.ard.system.service.ISysMenuService;
			import com.ard.system.service.ISysRoleService;
			import com.ard.system.service.system.ISysMenuService;
			import com.ard.system.service.system.ISysRoleService;

			/**
			* 用户权限处理