Merge branch 'dev' into pre-production

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

@@ -150,12 +150,17 @@ public interface IUserClient {
 
 
 	@GetMapping(USER_INFO_BY_DEPT)
-	R<List<User>> userInfoByDept(@RequestParam("tenantId") String tenantId, @RequestParam("deptId") Long deptId);
+	R<List<User>> userInfoByDept(@RequestParam  String tenantId, @RequestParam Long deptId);
-
 
 
+	/**
+	 * 根据ids获取用户集合
+	 * @param tenantId 租户ID
+	 * @param ids 用户iD
+	 * @return
+	 */
 	@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);