Merge branch 'develop'

# Conflicts:
#	data/magic-api/api/系统管理/用户管理/所有机构.ms
#	data/magic-api/api/系统管理/组件/选择组件.ms
#	magic-boot/pom.xml
#	magic-boot/src/main/java/org/ssssssss/magicboot/extension/ResponseFunctionExtension.java
#	magic-boot/src/main/java/org/ssssssss/magicboot/interceptor/PermissionInterceptor.java
This commit is contained in:
zegezy
2023-08-24 09:45:50 +08:00
9 changed files with 29 additions and 29 deletions
@@ -224,8 +224,8 @@
"children" : [ ]
} ]
}
}
================================
}
================================
import org.ssssssss.magicapi.utils.PathUtils
import org.ssssssss.magicapi.core.service.MagicResourceService
var getFiles = (groupId) => {