Merge remote-tracking branch 'base-version/main' into test

# Conflicts:
#	pom.xml
#	zt-dependencies/pom.xml

zt-module-system/zt-module-system-api/src/main/java/com/zt/plat/module/system/api/user/dto/AdminUserRespDTO.java

@@ -23,6 +23,16 @@ public class AdminUserRespDTO implements VO {
     @Schema(description = "部门编号列表", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     private List<Long> deptIds;
 
+    @Schema(description = "部门编号", requiredMode = Schema.RequiredMode.NOT_REQUIRED, example = "1")
+    private Long deptId;
+
+    public Long getDeptId() {
+        if (deptIds != null && !deptIds.isEmpty()) {
+            return deptIds.get(0);
+        }
+        return null;
+    }
+
     @Schema(description = "岗位编号数组", requiredMode = Schema.RequiredMode.REQUIRED, example = "[1, 3]")
     private Set<Long> postIds;