From faf55275dcb8d413f18642b3410c8e7df9f6cd9c Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Thu, 29 Jan 2026 10:09:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/dto/FwAreaDivideStatisticsDTO.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/dto/FwAreaDivideStatisticsDTO.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/dto/FwAreaDivideStatisticsDTO.java
index c74f7c3..31b26fa 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/dto/FwAreaDivideStatisticsDTO.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/dto/FwAreaDivideStatisticsDTO.java
@@ -17,8 +17,13 @@
package org.sxkj.fw.area.dto;
import java.util.Date;
+import java.io.Serializable;
+import java.util.List;
+
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
/**
* 区域划分统计 数据传输对象实体类
@@ -27,13 +32,14 @@
* @since 2026-01-12
*/
@Data
-public class FwAreaDivideStatisticsDTO {
+public class FwAreaDivideStatisticsDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键id
*/
@ApiModelProperty(value = "主键id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long id;
/**
@@ -99,4 +105,7 @@
*/
@ApiModelProperty(value = "删除标志（0存在 1删除）")
private Integer isDeleted;
+
+ @ApiModelProperty(value = "部门集合",hidden = true)
+ private List<Long> deptList;
}
--
Gitblit v1.9.3