Merge branch 'dev' into pre-production

blade-service-api/blade-user-api/src/main/java/org/springblade/system/feign/IUserClient.java

@@ -155,7 +155,7 @@ public interface IUserClient {
 
 
 	@GetMapping(USER_INFO_BY_IDS)
-	R<List<User>> userInfoByIds(@RequestParam("tenantId") String tenantId, @RequestParam("deptId") String ids);
+	R<List<User>> userInfoByIds(@RequestParam String tenantId, @RequestParam String ids);