From 12cb0f2f79f216864b8f68b63309f409db68e02f Mon Sep 17 00:00:00 2001 From: xiebin <vip_xiaobin810@163.com> Date: Thu, 22 Jan 2026 11:18:38 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- drone-service/drone-fw/src/main/java/org/sxkj/fw/area/vo/FwAreaDivideVO.java | 11 +++-------- 1 files changed, 3 insertions(+), 8 deletions(-) diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/vo/FwAreaDivideVO.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/vo/FwAreaDivideVO.java index 9325f65..9308081 100644 --- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/vo/FwAreaDivideVO.java +++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/vo/FwAreaDivideVO.java @@ -16,13 +16,12 @@ */ package org.sxkj.fw.area.vo; -import com.fasterxml.jackson.annotation.JsonFormat; +import java.util.Date; import io.swagger.annotations.ApiModelProperty; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; - import java.math.BigDecimal; import java.time.LocalDateTime; -import java.util.Date; /** * 区域划分表 视图实体类 @@ -141,11 +140,6 @@ */ @ApiModelProperty(value = "状态(0正常 1停用)") private Integer status; - /** - * 是否删除(0未删除 1已删除) - */ - @ApiModelProperty(value = "是否删除(0未删除 1已删除)") - private Integer isDeleted; // VO 扩展字段 /** @@ -163,4 +157,5 @@ */ @ApiModelProperty(value = "派出所联系电话") private String policeStationContactPhone; + } -- Gitblit v1.9.3