区域新增 占用字段

zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/area/dto/AreaDTO.java

@@ -1,12 +0,0 @@
-package cn.iocoder.yudao.module.farm.controller.admin.area.dto;
-
-/**
- * @Created by jiu on 2022/6/15.
- */
-public class AreaDTO {
-
-    String firstAreaName;
-
-    String secondAreaName;
-
-}

zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/area/vo/AreaBaseVO.java

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.farm.controller.admin.area.vo;
 
+import com.sun.org.apache.xpath.internal.operations.Bool;
 import lombok.*;
 import java.util.*;
 import io.swagger.annotations.*;
@@ -23,5 +24,8 @@ public class AreaBaseVO {
 
     private Boolean pretendDelete;
 
+    @ApiModelProperty("是否占用")
+    private Boolean occupied;
+
 
 }

zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/area/vo/AreaExcelVO.java

@@ -29,4 +29,7 @@ public class AreaExcelVO {
 
     private Boolean pretendDelete;
 
+    @ApiModelProperty("是否占用")
+    private Boolean occupied;
+
 }

zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/area/vo/AreaExportReqVO.java

@@ -29,4 +29,7 @@ public class AreaExportReqVO {
 
     private Boolean pretendDelete;
 
+    @ApiModelProperty("是否占用")
+    private Boolean occupied;
+
 }

zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/area/vo/AreaPageReqVO.java

@@ -29,4 +29,7 @@ public class AreaPageReqVO extends PageParam {
 
     private Boolean pretendDelete = false;
 
+    @ApiModelProperty("是否占用")
+    private Boolean occupied;
+
 }

zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/area/vo/AreaRespVO.java

@@ -20,4 +20,6 @@ public class AreaRespVO extends AreaBaseVO {
 
     private Boolean pretendDelete;
 
+    @ApiModelProperty("是否占用")
+    private Boolean occupied;
 }

zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/area/AreaDO.java

@@ -39,4 +39,7 @@ public class AreaDO extends BaseDO {
     @ApiModelProperty("假装删除")
     private Boolean pretendDelete;
 
+    @ApiModelProperty("是否占用")
+    private Boolean occupied;
+
 }