diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/area/vo/AreaBaseVO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/area/vo/AreaBaseVO.java
index f901c773..c9f50f3b 100644
--- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/area/vo/AreaBaseVO.java
+++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/area/vo/AreaBaseVO.java
@@ -19,5 +19,7 @@ public class AreaBaseVO {
 
     private Long parentId;
 
+    private Boolean pretendDelete;
+
 
 }
diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/area/vo/AreaExcelVO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/area/vo/AreaExcelVO.java
index 92188d84..6240b924 100644
--- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/area/vo/AreaExcelVO.java
+++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/area/vo/AreaExcelVO.java
@@ -25,4 +25,6 @@ public class AreaExcelVO {
     @ExcelProperty("")
     private Date createTime;
 
+    private Boolean pretendDelete;
+
 }
diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/area/vo/AreaExportReqVO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/area/vo/AreaExportReqVO.java
index a8c2a7a6..1a5899c4 100644
--- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/area/vo/AreaExportReqVO.java
+++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/area/vo/AreaExportReqVO.java
@@ -25,4 +25,6 @@ public class AreaExportReqVO {
     @ApiModelProperty(value = "结束")
     private Date endCreateTime;
 
+    private Boolean pretendDelete;
+
 }
diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/area/vo/AreaPageReqVO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/area/vo/AreaPageReqVO.java
index aff59bc6..500e827a 100644
--- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/area/vo/AreaPageReqVO.java
+++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/area/vo/AreaPageReqVO.java
@@ -27,4 +27,6 @@ public class AreaPageReqVO extends PageParam {
     @ApiModelProperty(value = "结束")
     private Date endCreateTime;
 
+    private Boolean pretendDelete = false;
+
 }
diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/area/vo/AreaRespVO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/area/vo/AreaRespVO.java
index 74aafe22..659bc3bd 100644
--- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/area/vo/AreaRespVO.java
+++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/area/vo/AreaRespVO.java
@@ -18,4 +18,6 @@ public class AreaRespVO extends AreaBaseVO {
     @ApiModelProperty(value = "")
     private Date createTime;
 
+    private Boolean pretendDelete;
+
 }
diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/crop/vo/CropBaseVO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/crop/vo/CropBaseVO.java
index 861501c9..9c57d4b7 100644
--- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/crop/vo/CropBaseVO.java
+++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/crop/vo/CropBaseVO.java
@@ -24,4 +24,6 @@ public class CropBaseVO {
     @NotNull(message = "当前库存不能为空")
     private Integer stock;
 
+    private Boolean pretendDelete;
+
 }
diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/crop/vo/CropExcelVO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/crop/vo/CropExcelVO.java
index 179a23b1..8f699ac2 100644
--- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/crop/vo/CropExcelVO.java
+++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/crop/vo/CropExcelVO.java
@@ -30,4 +30,6 @@ public class CropExcelVO {
     @ExcelProperty("")
     private Date createTime;
 
+    private Boolean pretendDelete;
+
 }
diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/crop/vo/CropExportReqVO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/crop/vo/CropExportReqVO.java
index b15b4072..dcad465f 100644
--- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/crop/vo/CropExportReqVO.java
+++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/crop/vo/CropExportReqVO.java
@@ -30,4 +30,6 @@ public class CropExportReqVO {
     @ApiModelProperty(value = "结束")
     private Date endCreateTime;
 
+    private Boolean pretendDelete;
+
 }
diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/crop/vo/CropPageReqVO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/crop/vo/CropPageReqVO.java
index b282a9cd..49e802c0 100644
--- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/crop/vo/CropPageReqVO.java
+++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/crop/vo/CropPageReqVO.java
@@ -32,4 +32,6 @@ public class CropPageReqVO extends PageParam {
     @ApiModelProperty(value = "结束")
     private Date endCreateTime;
 
+    private Boolean pretendDelete = false;
+
 }
diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropRecord/vo/CropRecordBaseVO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropRecord/vo/CropRecordBaseVO.java
index 22a66c48..c68a73fd 100644
--- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropRecord/vo/CropRecordBaseVO.java
+++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropRecord/vo/CropRecordBaseVO.java
@@ -27,4 +27,6 @@ public class CropRecordBaseVO {
     @NotNull(message = "剩余数量不能为空")
     private Integer afterStock;
 
+    private Boolean pretendDelete;
+
 }
diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropRecord/vo/CropRecordExcelVO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropRecord/vo/CropRecordExcelVO.java
index cc5c5ffc..3354643c 100644
--- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropRecord/vo/CropRecordExcelVO.java
+++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropRecord/vo/CropRecordExcelVO.java
@@ -32,4 +32,6 @@ public class CropRecordExcelVO {
     @ExcelProperty("")
     private Date createTime;
 
+    private Boolean pretendDelete;
+
 }
diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropRecord/vo/CropRecordExportReqVO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropRecord/vo/CropRecordExportReqVO.java
index fbfda851..5f765eaf 100644
--- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropRecord/vo/CropRecordExportReqVO.java
+++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropRecord/vo/CropRecordExportReqVO.java
@@ -32,4 +32,6 @@ public class CropRecordExportReqVO {
     @ApiModelProperty(value = "结束")
     private Date endCreateTime;
 
+    private Boolean pretendDelete;
+
 }
diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropRecord/vo/CropRecordPageReqVO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropRecord/vo/CropRecordPageReqVO.java
index d35158a1..d8581906 100644
--- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropRecord/vo/CropRecordPageReqVO.java
+++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropRecord/vo/CropRecordPageReqVO.java
@@ -34,4 +34,6 @@ public class CropRecordPageReqVO extends PageParam {
     @ApiModelProperty(value = "结束")
     private Date endCreateTime;
 
+    private Boolean pretendDelete = false;
+
 }
diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/discuss/vo/DiscussBaseVO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/discuss/vo/DiscussBaseVO.java
index 21b0e908..24e9c945 100644
--- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/discuss/vo/DiscussBaseVO.java
+++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/discuss/vo/DiscussBaseVO.java
@@ -36,4 +36,5 @@ public class DiscussBaseVO {
 
     private List<WorkHourBaseVO> workHourList;
 
+    private Boolean pretendDelete;
 }
diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/discuss/vo/DiscussExcelVO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/discuss/vo/DiscussExcelVO.java
index f65cd59a..0677f436 100644
--- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/discuss/vo/DiscussExcelVO.java
+++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/discuss/vo/DiscussExcelVO.java
@@ -43,4 +43,6 @@ public class DiscussExcelVO {
     @ExcelProperty("")
     private List<WorkHourBaseVO> workHourList;
 
+    private Boolean pretendDelete;
+
 }
diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/discuss/vo/DiscussExportReqVO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/discuss/vo/DiscussExportReqVO.java
index ce0e9a59..50d1ea15 100644
--- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/discuss/vo/DiscussExportReqVO.java
+++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/discuss/vo/DiscussExportReqVO.java
@@ -37,4 +37,6 @@ public class DiscussExportReqVO {
     @ApiModelProperty(value = "结束")
     private Date endCreateTime;
 
+    private Boolean pretendDelete;
+
 }
diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/discuss/vo/DiscussPageReqVO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/discuss/vo/DiscussPageReqVO.java
index de225d92..bab5f2bf 100644
--- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/discuss/vo/DiscussPageReqVO.java
+++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/discuss/vo/DiscussPageReqVO.java
@@ -39,4 +39,6 @@ public class DiscussPageReqVO extends PageParam {
     @ApiModelProperty(value = "结束")
     private Date endCreateTime;
 
+    private Boolean pretendDelete = false;
+
 }
diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/event/vo/EventBaseVO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/event/vo/EventBaseVO.java
index 9e4235dc..78252fb7 100644
--- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/event/vo/EventBaseVO.java
+++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/event/vo/EventBaseVO.java
@@ -30,4 +30,6 @@ public class EventBaseVO {
     @ApiModelProperty(value = "")
     private JSONArray images;
 
+    private Boolean pretendDelete;
+
 }
diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/event/vo/EventExcelVO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/event/vo/EventExcelVO.java
index f5bda1c2..620883b2 100644
--- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/event/vo/EventExcelVO.java
+++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/event/vo/EventExcelVO.java
@@ -36,4 +36,6 @@ public class EventExcelVO {
     @ExcelProperty("")
     private Date createTime;
 
+    private Boolean pretendDelete;
+
 }
diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/event/vo/EventExportReqVO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/event/vo/EventExportReqVO.java
index 804f6733..293dee5a 100644
--- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/event/vo/EventExportReqVO.java
+++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/event/vo/EventExportReqVO.java
@@ -36,4 +36,6 @@ public class EventExportReqVO {
     @ApiModelProperty(value = "结束")
     private Date endCreateTime;
 
+    private Boolean pretendDelete;
+
 }
diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/event/vo/EventPageReqVO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/event/vo/EventPageReqVO.java
index 7ab09c1e..95594263 100644
--- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/event/vo/EventPageReqVO.java
+++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/event/vo/EventPageReqVO.java
@@ -38,4 +38,6 @@ public class EventPageReqVO extends PageParam {
     @ApiModelProperty(value = "结束")
     private Date endCreateTime;
 
+    private Boolean pretendDelete = false;
+
 }
diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/event/vo/EventSearchPageReqVO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/event/vo/EventSearchPageReqVO.java
index c7dc4587..3351bc7a 100644
--- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/event/vo/EventSearchPageReqVO.java
+++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/event/vo/EventSearchPageReqVO.java
@@ -43,4 +43,6 @@ public class EventSearchPageReqVO extends PageParam {
     @ApiModelProperty(value = "结束")
     private LocalDateTime endCreateTime;
 
+    private Boolean pretendDelete;
+
 }
diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/area/AreaDO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/area/AreaDO.java
index 7a3f2bb9..9fb36541 100644
--- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/area/AreaDO.java
+++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/area/AreaDO.java
@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.farm.dal.dataobject.area;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 import java.util.*;
 import com.baomidou.mybatisplus.annotation.*;
@@ -31,4 +32,7 @@ public class AreaDO extends BaseDO {
 
     private Long parentId;
 
+    @ApiModelProperty("假装删除")
+    private Boolean pretendDelete;
+
 }
diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/crop/CropDO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/crop/CropDO.java
index eb975120..983fec03 100644
--- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/crop/CropDO.java
+++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/crop/CropDO.java
@@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.farm.dal.dataobject.crop;
 
 import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 import java.util.*;
 import com.baomidou.mybatisplus.annotation.*;
@@ -40,4 +41,7 @@ public class CropDO extends BaseDO {
      */
     private Integer stock;
 
+    @ApiModelProperty("假装删除")
+    private Boolean pretendDelete;
+
 }
diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/cropRecord/CropRecordDO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/cropRecord/CropRecordDO.java
index b8834598..2000aec9 100644
--- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/cropRecord/CropRecordDO.java
+++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/cropRecord/CropRecordDO.java
@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.farm.dal.dataobject.cropRecord;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 import java.util.*;
 import com.baomidou.mybatisplus.annotation.*;
@@ -41,4 +42,7 @@ public class CropRecordDO extends BaseDO {
      */
     private Integer afterStock;
 
+    @ApiModelProperty("假装删除")
+    private Boolean pretendDelete;
+
 }
diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/discuss/DiscussDO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/discuss/DiscussDO.java
index b75f93af..0e2b807c 100644
--- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/discuss/DiscussDO.java
+++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/discuss/DiscussDO.java
@@ -4,6 +4,7 @@ import cn.iocoder.yudao.module.farm.controller.admin.workHour.vo.WorkHourBaseVO;
 import cn.iocoder.yudao.module.farm.dal.dataobject.workHour.WorkHourDO;
 import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 import java.util.*;
 import com.baomidou.mybatisplus.annotation.*;
@@ -55,4 +56,7 @@ public class DiscussDO extends BaseDO {
 
     private Integer cropNum;
 
+    @ApiModelProperty("假装删除")
+    private Boolean pretendDelete;
+
 }
diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/event/EventDO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/event/EventDO.java
index 2e025e65..13aa641b 100644
--- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/event/EventDO.java
+++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/event/EventDO.java
@@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.farm.dal.dataobject.event;
 
 import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 import java.util.*;
 import com.baomidou.mybatisplus.annotation.*;
@@ -48,4 +49,7 @@ public class EventDO extends BaseDO {
     @TableField(typeHandler = JacksonTypeHandler.class)
     private JSONArray images;
 
+    @ApiModelProperty("假装删除")
+    private Boolean pretendDelete;
+
 }
diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/area/AreaMapper.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/area/AreaMapper.java
index 0c146bbf..3736ba8a 100644
--- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/area/AreaMapper.java
+++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/area/AreaMapper.java
@@ -22,6 +22,7 @@ public interface AreaMapper extends BaseMapperX<AreaDO> {
                 .likeIfPresent(AreaDO::getName, reqVO.getName())
                 .eqIfPresent(AreaDO::getParentId, reqVO.getParentId())
                 .betweenIfPresent(AreaDO::getCreateTime, reqVO.getBeginCreateTime(), reqVO.getEndCreateTime())
+                .eqIfPresent(AreaDO::getPretendDelete, reqVO.getPretendDelete())
                 .orderByDesc(AreaDO::getId));
     }
 
@@ -30,6 +31,7 @@ public interface AreaMapper extends BaseMapperX<AreaDO> {
                 .likeIfPresent(AreaDO::getName, reqVO.getName())
                 .eqIfPresent(AreaDO::getParentId, reqVO.getParentId())
                 .betweenIfPresent(AreaDO::getCreateTime, reqVO.getBeginCreateTime(), reqVO.getEndCreateTime())
+                .eqIfPresent(AreaDO::getPretendDelete, reqVO.getPretendDelete())
                 .orderByDesc(AreaDO::getId));
     }
 
diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/crop/CropMapper.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/crop/CropMapper.java
index 8ac2001f..1a24da7c 100644
--- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/crop/CropMapper.java
+++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/crop/CropMapper.java
@@ -23,6 +23,7 @@ public interface CropMapper extends BaseMapperX<CropDO> {
                 .eqIfPresent(CropDO::getImages, reqVO.getImages())
                 .eqIfPresent(CropDO::getStock, reqVO.getStock())
                 .betweenIfPresent(CropDO::getCreateTime, reqVO.getBeginCreateTime(), reqVO.getEndCreateTime())
+                .eqIfPresent(CropDO::getPretendDelete, reqVO.getPretendDelete())
                 .orderByDesc(CropDO::getId));
     }
 
@@ -32,6 +33,7 @@ public interface CropMapper extends BaseMapperX<CropDO> {
                 .eqIfPresent(CropDO::getImages, reqVO.getImages())
                 .eqIfPresent(CropDO::getStock, reqVO.getStock())
                 .betweenIfPresent(CropDO::getCreateTime, reqVO.getBeginCreateTime(), reqVO.getEndCreateTime())
+                .eqIfPresent(CropDO::getPretendDelete, reqVO.getPretendDelete())
                 .orderByDesc(CropDO::getId));
     }
 
diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/cropRecord/CropRecordMapper.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/cropRecord/CropRecordMapper.java
index 94383c82..ff799bd7 100644
--- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/cropRecord/CropRecordMapper.java
+++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/cropRecord/CropRecordMapper.java
@@ -24,6 +24,7 @@ public interface CropRecordMapper extends BaseMapperX<CropRecordDO> {
                 .eqIfPresent(CropRecordDO::getStock, reqVO.getStock())
                 .eqIfPresent(CropRecordDO::getAfterStock, reqVO.getAfterStock())
                 .betweenIfPresent(CropRecordDO::getCreateTime, reqVO.getBeginCreateTime(), reqVO.getEndCreateTime())
+                .eqIfPresent(CropRecordDO::getPretendDelete, reqVO.getPretendDelete())
                 .orderByDesc(CropRecordDO::getId));
     }
 
@@ -34,6 +35,7 @@ public interface CropRecordMapper extends BaseMapperX<CropRecordDO> {
                 .eqIfPresent(CropRecordDO::getStock, reqVO.getStock())
                 .eqIfPresent(CropRecordDO::getAfterStock, reqVO.getAfterStock())
                 .betweenIfPresent(CropRecordDO::getCreateTime, reqVO.getBeginCreateTime(), reqVO.getEndCreateTime())
+                .eqIfPresent(CropRecordDO::getPretendDelete, reqVO.getPretendDelete())
                 .orderByDesc(CropRecordDO::getId));
     }
 
diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/discuss/DiscussMapper.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/discuss/DiscussMapper.java
index da710ef0..b313573b 100644
--- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/discuss/DiscussMapper.java
+++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/discuss/DiscussMapper.java
@@ -24,6 +24,7 @@ public interface DiscussMapper extends BaseMapperX<DiscussDO> {
                 .eqIfPresent(DiscussDO::getContent, reqVO.getContent())
                 .eqIfPresent(DiscussDO::getImages, reqVO.getImages())
                 .betweenIfPresent(DiscussDO::getCreateTime, reqVO.getBeginCreateTime(), reqVO.getEndCreateTime())
+                .eqIfPresent(DiscussDO::getPretendDelete, reqVO.getPretendDelete())
                 .orderByDesc(DiscussDO::getId));
     }
 
@@ -34,6 +35,7 @@ public interface DiscussMapper extends BaseMapperX<DiscussDO> {
                 .eqIfPresent(DiscussDO::getContent, reqVO.getContent())
                 .eqIfPresent(DiscussDO::getImages, reqVO.getImages())
                 .betweenIfPresent(DiscussDO::getCreateTime, reqVO.getBeginCreateTime(), reqVO.getEndCreateTime())
+                .eqIfPresent(DiscussDO::getPretendDelete, reqVO.getPretendDelete())
                 .orderByDesc(DiscussDO::getId));
     }
 
diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/event/EventMapper.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/event/EventMapper.java
index facca987..0f136c17 100644
--- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/event/EventMapper.java
+++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/event/EventMapper.java
@@ -25,6 +25,7 @@ public interface EventMapper extends BaseMapperX<EventDO> {
                 .eqIfPresent(EventDO::getContent, reqVO.getContent())
                 .eqIfPresent(EventDO::getImages, reqVO.getImages())
                 .betweenIfPresent(EventDO::getCreateTime, reqVO.getBeginCreateTime(), reqVO.getEndCreateTime())
+                .eqIfPresent(EventDO::getPretendDelete, reqVO.getPretendDelete())
                 .orderByDesc(EventDO::getId));
     }
 
@@ -36,6 +37,7 @@ public interface EventMapper extends BaseMapperX<EventDO> {
                 .eqIfPresent(EventDO::getContent, reqVO.getContent())
                 .eqIfPresent(EventDO::getImages, reqVO.getImages())
                 .betweenIfPresent(EventDO::getCreateTime, reqVO.getBeginCreateTime(), reqVO.getEndCreateTime())
+                .eqIfPresent(EventDO::getPretendDelete, reqVO.getPretendDelete())
                 .orderByDesc(EventDO::getId));
     }
 
diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/service/area/AreaServiceImpl.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/service/area/AreaServiceImpl.java
index a33017d0..9d1e6f50 100644
--- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/service/area/AreaServiceImpl.java
+++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/service/area/AreaServiceImpl.java
@@ -4,6 +4,7 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.google.gson.JsonArray;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
@@ -53,15 +54,18 @@ public class AreaServiceImpl implements AreaService {
     @Override
     public void deleteArea(Long id) {
         // 校验存在
-        this.validateAreaExists(id);
-        // 删除
-        areaMapper.deleteById(id);
+        AreaDO areaDO = this.validateAreaExists(id);
+        // 假装删除
+        areaDO.setPretendDelete(true);
+        areaMapper.updateById(areaDO);
     }
 
-    private void validateAreaExists(Long id) {
-        if (areaMapper.selectById(id) == null) {
+    private AreaDO validateAreaExists(Long id) {
+        AreaDO areaDO = areaMapper.selectById(id);
+        if (areaDO == null) {
             throw exception(AREA_NOT_EXISTS);
         }
+        return areaDO;
     }
 
     @Override
diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/service/crop/CropServiceImpl.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/service/crop/CropServiceImpl.java
index d6b30b64..2fd09fcd 100644
--- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/service/crop/CropServiceImpl.java
+++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/service/crop/CropServiceImpl.java
@@ -48,15 +48,18 @@ public class CropServiceImpl implements CropService {
     @Override
     public void deleteCrop(Long id) {
         // 校验存在
-        this.validateCropExists(id);
+        CropDO cropDO = this.validateCropExists(id);
         // 删除
-        cropMapper.deleteById(id);
+        cropDO.setPretendDelete(true);
+        cropMapper.updateById(cropDO);
     }
 
-    private void validateCropExists(Long id) {
-        if (cropMapper.selectById(id) == null) {
+    private CropDO validateCropExists(Long id) {
+        CropDO cropDO = cropMapper.selectById(id);
+        if (cropDO == null) {
             throw exception(CROP_NOT_EXISTS);
         }
+        return cropDO;
     }
 
     @Override
diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/service/cropRecord/CropRecordServiceImpl.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/service/cropRecord/CropRecordServiceImpl.java
index b256fd8b..9fa70f7f 100644
--- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/service/cropRecord/CropRecordServiceImpl.java
+++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/service/cropRecord/CropRecordServiceImpl.java
@@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.farm.service.cropRecord;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.module.farm.dal.dataobject.crop.CropDO;
 import cn.iocoder.yudao.module.farm.dal.mysql.crop.CropMapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import org.apache.poi.ss.formula.functions.T;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
@@ -79,15 +80,18 @@ public class CropRecordServiceImpl implements CropRecordService {
     @Override
     public void deleteCropRecord(Long id) {
         // 校验存在
-        this.validateCropRecordExists(id);
+        CropRecordDO cropRecordDO = this.validateCropRecordExists(id);
         // 删除
-        cropRecordMapper.deleteById(id);
+        cropRecordDO.setPretendDelete(true);
+        cropRecordMapper.updateById(cropRecordDO);
     }
 
-    private void validateCropRecordExists(Long id) {
-        if (cropRecordMapper.selectById(id) == null) {
+    private CropRecordDO validateCropRecordExists(Long id) {
+        CropRecordDO cropRecordDO = cropRecordMapper.selectById(id);
+        if (cropRecordDO == null) {
             throw exception(CROP_RECORD_NOT_EXISTS);
         }
+        return cropRecordDO;
     }
 
     @Override
diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/service/discuss/DiscussServiceImpl.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/service/discuss/DiscussServiceImpl.java
index 382aa781..f58f25f9 100644
--- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/service/discuss/DiscussServiceImpl.java
+++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/service/discuss/DiscussServiceImpl.java
@@ -114,15 +114,18 @@ public class DiscussServiceImpl implements DiscussService {
     @Override
     public void deleteDiscuss(Long id) {
         // 校验存在
-        this.validateDiscussExists(id);
+        DiscussDO discussDO = this.validateDiscussExists(id);
         // 删除
-        discussMapper.deleteById(id);
+        discussDO.setPretendDelete(true);
+        discussMapper.updateById(discussDO);
     }
 
-    private void validateDiscussExists(Long id) {
-        if (discussMapper.selectById(id) == null) {
+    private DiscussDO validateDiscussExists(Long id) {
+        DiscussDO discussDO = discussMapper.selectById(id);
+        if (discussDO == null) {
             throw exception(DISCUSS_NOT_EXISTS);
         }
+        return discussDO;
     }
 
     @Override
diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/service/event/EventServiceImpl.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/service/event/EventServiceImpl.java
index 7360c81b..0d2d6a7d 100644
--- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/service/event/EventServiceImpl.java
+++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/service/event/EventServiceImpl.java
@@ -50,15 +50,18 @@ public class EventServiceImpl implements EventService {
     @Override
     public void deleteEvent(Long id) {
         // 校验存在
-        this.validateEventExists(id);
+        EventDO eventDO = this.validateEventExists(id);
         // 删除
-        eventMapper.deleteById(id);
+        eventDO.setPretendDelete(true);
+        eventMapper.updateById(eventDO);
     }
 
-    private void validateEventExists(Long id) {
-        if (eventMapper.selectById(id) == null) {
+    private EventDO validateEventExists(Long id) {
+        EventDO eventDO = eventMapper.selectById(id);
+        if (eventDO == null) {
             throw exception(EVENT_NOT_EXISTS);
         }
+        return eventDO;
     }
 
     @Override