diff --git a/src/main/java/com/gunshi/project/xyt/entity/so/WarnPageSo.java b/src/main/java/com/gunshi/project/xyt/entity/so/WarnPageSo.java
index be89a82..dd06f83 100644
--- a/src/main/java/com/gunshi/project/xyt/entity/so/WarnPageSo.java
+++ b/src/main/java/com/gunshi/project/xyt/entity/so/WarnPageSo.java
@@ -4,6 +4,7 @@ import com.gunshi.db.dto.PageSo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 /**
  * Description:
@@ -12,6 +13,7 @@ import lombok.Data;
  * @author wanyan
  * @version 1.0
  */
+@EqualsAndHashCode(callSuper = true)
 @Data
 @Schema(description = "隐患预警分页查询对象")
 public class WarnPageSo extends WarnSo{
diff --git a/src/main/java/com/gunshi/project/xyt/entity/vo/AttRvMonitorDetailVo.java b/src/main/java/com/gunshi/project/xyt/entity/vo/AttRvMonitorDetailVo.java
index 9f800a9..bd0740a 100644
--- a/src/main/java/com/gunshi/project/xyt/entity/vo/AttRvMonitorDetailVo.java
+++ b/src/main/java/com/gunshi/project/xyt/entity/vo/AttRvMonitorDetailVo.java
@@ -2,6 +2,7 @@ package com.gunshi.project.xyt.entity.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.math.BigDecimal;
 
@@ -12,6 +13,7 @@ import java.math.BigDecimal;
  * @author wanyan
  * @version 1.0
  */
+@EqualsAndHashCode(callSuper = true)
 @Data
 public class AttRvMonitorDetailVo extends StPptnDetailsVo {
 
diff --git a/src/main/java/com/gunshi/project/xyt/entity/vo/OsmoticStationVo.java b/src/main/java/com/gunshi/project/xyt/entity/vo/OsmoticStationVo.java
index c5a0f3f..d127347 100644
--- a/src/main/java/com/gunshi/project/xyt/entity/vo/OsmoticStationVo.java
+++ b/src/main/java/com/gunshi/project/xyt/entity/vo/OsmoticStationVo.java
@@ -2,6 +2,7 @@ package com.gunshi.project.xyt.entity.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -13,6 +14,7 @@ import java.util.List;
  * @author wanyan
  * @version 1.0
  */
+@EqualsAndHashCode(callSuper = true)
 @Data
 public class OsmoticStationVo extends StRzVo {
 
diff --git a/src/main/java/com/gunshi/project/xyt/entity/vo/OsmoticWarnVo.java b/src/main/java/com/gunshi/project/xyt/entity/vo/OsmoticWarnVo.java
index 17e115d..08d5434 100644
--- a/src/main/java/com/gunshi/project/xyt/entity/vo/OsmoticWarnVo.java
+++ b/src/main/java/com/gunshi/project/xyt/entity/vo/OsmoticWarnVo.java
@@ -7,6 +7,7 @@ import com.gunshi.core.dateformat.DateFormatString;
 import com.gunshi.project.xyt.model.OsmoticWarnRule;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -18,6 +19,7 @@ import java.util.Date;
  * @author wanyan
  * @version 1.0
  */
+@EqualsAndHashCode(callSuper = true)
 @Data
 public class OsmoticWarnVo extends OsmoticWarnRule {
     /**
diff --git a/src/main/java/com/gunshi/project/xyt/entity/vo/RescueTeamVo.java b/src/main/java/com/gunshi/project/xyt/entity/vo/RescueTeamVo.java
index a935015..bba48bb 100644
--- a/src/main/java/com/gunshi/project/xyt/entity/vo/RescueTeamVo.java
+++ b/src/main/java/com/gunshi/project/xyt/entity/vo/RescueTeamVo.java
@@ -3,8 +3,10 @@ package com.gunshi.project.xyt.entity.vo;
 import com.gunshi.project.xyt.model.RescueTeamB;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 
+@EqualsAndHashCode(callSuper = true)
 @Data
 public class RescueTeamVo extends RescueTeamB {
 
diff --git a/src/main/java/com/gunshi/project/xyt/entity/vo/StStbprpCctvVo.java b/src/main/java/com/gunshi/project/xyt/entity/vo/StStbprpCctvVo.java
index 83071fc..13a475a 100644
--- a/src/main/java/com/gunshi/project/xyt/entity/vo/StStbprpCctvVo.java
+++ b/src/main/java/com/gunshi/project/xyt/entity/vo/StStbprpCctvVo.java
@@ -3,7 +3,9 @@ package com.gunshi.project.xyt.entity.vo;
 import com.gunshi.project.xyt.model.StStbprpCctv;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
+@EqualsAndHashCode(callSuper = true)
 @Data
 public class StStbprpCctvVo extends StStbprpCctv {
 
diff --git a/src/main/java/com/gunshi/project/xyt/entity/vo/TyYearRainfallVo.java b/src/main/java/com/gunshi/project/xyt/entity/vo/TyYearRainfallVo.java
index 74c58b1..aa3da6f 100644
--- a/src/main/java/com/gunshi/project/xyt/entity/vo/TyYearRainfallVo.java
+++ b/src/main/java/com/gunshi/project/xyt/entity/vo/TyYearRainfallVo.java
@@ -3,6 +3,7 @@ package com.gunshi.project.xyt.entity.vo;
 import com.gunshi.project.xyt.model.TyYearRainfall;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.util.List;
 
@@ -13,6 +14,7 @@ import java.util.List;
  * @author wanyan
  * @version 1.0
  */
+@EqualsAndHashCode(callSuper = true)
 @Data
 public class TyYearRainfallVo extends TyYearRainfall {
 
diff --git a/src/main/java/com/gunshi/project/xyt/model/ForecastK.java b/src/main/java/com/gunshi/project/xyt/model/ForecastK.java
index 41dda49..4f912b6 100644
--- a/src/main/java/com/gunshi/project/xyt/model/ForecastK.java
+++ b/src/main/java/com/gunshi/project/xyt/model/ForecastK.java
@@ -10,6 +10,7 @@ import com.gunshi.core.dateformat.DateFormatString;
 import com.gunshi.project.xyt.entity.page.GenericPageParams;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -20,6 +21,7 @@ import java.util.Date;
 * author: cxw
 * date: 2024-07-30 10:02:24
 */
+@EqualsAndHashCode(callSuper = true)
 @Schema(description="预报_前期影响雨量折减系数表")
 @Data
 @TableName("public.forecast_k")
diff --git a/src/main/java/com/gunshi/project/xyt/model/ForecastPPaR.java b/src/main/java/com/gunshi/project/xyt/model/ForecastPPaR.java
index ea666e6..c353dd9 100644
--- a/src/main/java/com/gunshi/project/xyt/model/ForecastPPaR.java
+++ b/src/main/java/com/gunshi/project/xyt/model/ForecastPPaR.java
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.gunshi.project.xyt.entity.page.GenericPageParams;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -15,6 +16,7 @@ import java.math.BigDecimal;
 * author: cxw
 * date: 2024-07-30 10:02:24
 */
+@EqualsAndHashCode(callSuper = true)
 @Schema(description="预报_降雨径流关系表")
 @Data
 @TableName("public.forecast_p_pa_r")
diff --git a/src/main/java/com/gunshi/project/xyt/model/ForecastProject.java b/src/main/java/com/gunshi/project/xyt/model/ForecastProject.java
index 528dbd0..94c9749 100644
--- a/src/main/java/com/gunshi/project/xyt/model/ForecastProject.java
+++ b/src/main/java/com/gunshi/project/xyt/model/ForecastProject.java
@@ -14,6 +14,7 @@ import com.gunshi.project.xyt.entity.vo.ForecastResultVo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.Size;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -25,6 +26,7 @@ import java.util.List;
 * author: cxw
 * date: 2024-08-05 11:41:45
 */
+@EqualsAndHashCode(callSuper = true)
 @Schema(description="预报_预测方案管理表")
 @Data
 @TableName("public.forecast_project")
diff --git a/src/main/java/com/gunshi/project/xyt/model/ForecastResults.java b/src/main/java/com/gunshi/project/xyt/model/ForecastResults.java
index 69b14ed..09837f9 100644
--- a/src/main/java/com/gunshi/project/xyt/model/ForecastResults.java
+++ b/src/main/java/com/gunshi/project/xyt/model/ForecastResults.java
@@ -1,7 +1,7 @@
 package com.gunshi.project.xyt.model;
 
 
-import com.alibaba.fastjson.annotation.JSONField;
+import com.alibaba.fastjson2.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -11,6 +11,7 @@ import com.gunshi.core.dateformat.DateFormatString;
 import com.gunshi.project.xyt.entity.page.GenericPageParams;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -21,6 +22,7 @@ import java.util.Date;
 * author: cxw
 * date: 2024-08-05 11:41:45
 */
+@EqualsAndHashCode(callSuper = true)
 @Schema(description="预报_预测结果表")
 @Data
 @TableName("public.forecast_results")
diff --git a/src/main/java/com/gunshi/project/xyt/model/ForecastTask.java b/src/main/java/com/gunshi/project/xyt/model/ForecastTask.java
index ae5fec5..a462fe3 100644
--- a/src/main/java/com/gunshi/project/xyt/model/ForecastTask.java
+++ b/src/main/java/com/gunshi/project/xyt/model/ForecastTask.java
@@ -14,6 +14,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.Size;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -24,6 +25,7 @@ import java.util.Date;
 * author: cxw
 * date: 2024-08-05 11:41:44
 */
+@EqualsAndHashCode(callSuper = true)
 @Schema(description="预报_预测自动任务管理表")
 @Data
 @TableName("public.forecast_task")
diff --git a/src/main/java/com/gunshi/project/xyt/model/ForecastU.java b/src/main/java/com/gunshi/project/xyt/model/ForecastU.java
index d7707dd..035b623 100644
--- a/src/main/java/com/gunshi/project/xyt/model/ForecastU.java
+++ b/src/main/java/com/gunshi/project/xyt/model/ForecastU.java
@@ -12,6 +12,7 @@ import com.gunshi.core.dateformat.DateFormatString;
 import com.gunshi.project.xyt.entity.page.GenericPageParams;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -22,6 +23,7 @@ import java.util.Date;
 * author: cxw
 * date: 2024-07-30 10:02:24
 */
+@EqualsAndHashCode(callSuper = true)
 @Schema(description="预报_时段单位线表")
 @Data
 @TableName("public.forecast_u")
diff --git a/src/main/java/com/gunshi/project/xyt/model/ForecastUseparam.java b/src/main/java/com/gunshi/project/xyt/model/ForecastUseparam.java
index c972315..7b8881c 100644
--- a/src/main/java/com/gunshi/project/xyt/model/ForecastUseparam.java
+++ b/src/main/java/com/gunshi/project/xyt/model/ForecastUseparam.java
@@ -13,6 +13,7 @@ import com.gunshi.project.xyt.entity.page.GenericPageParams;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.Size;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -22,6 +23,7 @@ import java.util.Date;
 * author: cxw
 * date: 2024-07-30 10:02:24
 */
+@EqualsAndHashCode(callSuper = true)
 @Schema(description="预报_通用参数管理")
 @Data
 @TableName("public.forecast_useparam")
diff --git a/src/main/java/com/gunshi/project/xyt/model/StWaterRReorganize.java b/src/main/java/com/gunshi/project/xyt/model/StWaterRReorganize.java
index 3bd1643..44391dc 100644
--- a/src/main/java/com/gunshi/project/xyt/model/StWaterRReorganize.java
+++ b/src/main/java/com/gunshi/project/xyt/model/StWaterRReorganize.java
@@ -18,12 +18,14 @@ import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Size;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 /**
 * 描述: 供水量整编表
 * author: cxw
 * date: 2024-07-24 11:22:46
 */
+@EqualsAndHashCode(callSuper = true)
 @Schema(description="供水量整编表")
 @Data
 @TableName("public.st_water_r_reorganize")