diff --git a/src/main/java/mjkf/xinke/main/common/http/FuHttpResponse.java b/src/main/java/mjkf/xinke/main/common/http/FuHttpResponse.java
index ca7f10d..a9eb8b1 100644
--- a/src/main/java/mjkf/xinke/main/common/http/FuHttpResponse.java
+++ b/src/main/java/mjkf/xinke/main/common/http/FuHttpResponse.java
@@ -1,7 +1,7 @@
 package mjkf.xinke.main.common.http;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.databind.PropertyNamingStrategy;
+import com.fasterxml.jackson.databind.PropertyNamingStrategies;
 import com.fasterxml.jackson.databind.annotation.JsonNaming;
 import com.jgy.xxs.core.http.NcMeta;
 import com.jgy.xxs.core.http.NcPagination;
@@ -11,7 +11,7 @@ import lombok.Getter;
 
 
 @Getter
-@JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class)
+@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
 public class FuHttpResponse<T> extends NcHttpResponse<T> {
     @JsonIgnore
     private NcMeta meta;
diff --git a/src/main/java/mjkf/xinke/main/model/db/BudgetItem.java b/src/main/java/mjkf/xinke/main/model/db/BudgetItem.java
index dca7450..4dee090 100644
--- a/src/main/java/mjkf/xinke/main/model/db/BudgetItem.java
+++ b/src/main/java/mjkf/xinke/main/model/db/BudgetItem.java
@@ -11,7 +11,7 @@ import java.util.List;
 import java.util.Map;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.databind.PropertyNamingStrategy;
+import com.fasterxml.jackson.databind.PropertyNamingStrategies;
 import com.fasterxml.jackson.databind.annotation.JsonNaming;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -30,7 +30,7 @@ import mjkf.xinke.main.model.vo.BudgetCreateRequest;
  */
 @Getter
 @Setter
-@JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class)
+@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
 @TableName(value="BUDGET_ITEM", autoResultMap=true)
 @ApiModel(value = "BudgetItem对象", description = "")
 public class BudgetItem extends Model<BudgetItem> {
diff --git a/src/main/java/mjkf/xinke/main/model/db/FuzhouHighwayBureau.java b/src/main/java/mjkf/xinke/main/model/db/FuzhouHighwayBureau.java
index a415cf3..bc12623 100644
--- a/src/main/java/mjkf/xinke/main/model/db/FuzhouHighwayBureau.java
+++ b/src/main/java/mjkf/xinke/main/model/db/FuzhouHighwayBureau.java
@@ -77,7 +77,6 @@ public class FuzhouHighwayBureau extends Model<FuzhouHighwayBureau> {
 
     public FuzhouHighwayBureau (Row row, MaterialTask task) {
         var policy = Row.MissingCellPolicy.CREATE_NULL_AS_BLANK;
-        row.getCell(0, policy).setCellType(CellType.STRING);
         this.setMaterialId(row.getCell(0, policy).getStringCellValue());
         this.setName(row.getCell(1, policy).getStringCellValue().replace(" ", ""));
         this.setSpec(row.getCell(2, policy).getStringCellValue().replace(" ", ""));
diff --git a/src/main/java/mjkf/xinke/main/model/db/LocalMaterial.java b/src/main/java/mjkf/xinke/main/model/db/LocalMaterial.java
index 69022da..a22d25a 100644
--- a/src/main/java/mjkf/xinke/main/model/db/LocalMaterial.java
+++ b/src/main/java/mjkf/xinke/main/model/db/LocalMaterial.java
@@ -11,7 +11,7 @@ import java.math.BigDecimal;
 import java.time.LocalDate;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.databind.PropertyNamingStrategy;
+import com.fasterxml.jackson.databind.PropertyNamingStrategies;
 import com.fasterxml.jackson.databind.annotation.JsonNaming;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -31,7 +31,7 @@ import org.apache.poi.ss.usermodel.Row;
 @Setter
 @TableName("LOCAL_MATERIAL")
 @ApiModel(value = "LocalMaterial对象", description = "地材")
-@JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class)
+@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
 public class LocalMaterial extends Model<LocalMaterial> {
 
     private static final long serialVersionUID = 1L;
diff --git a/src/main/java/mjkf/xinke/main/model/db/Material.java b/src/main/java/mjkf/xinke/main/model/db/Material.java
index 0df79f0..3e051bf 100644
--- a/src/main/java/mjkf/xinke/main/model/db/Material.java
+++ b/src/main/java/mjkf/xinke/main/model/db/Material.java
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.io.Serializable;
 import java.time.LocalDateTime;
 
-import com.fasterxml.jackson.databind.PropertyNamingStrategy;
+import com.fasterxml.jackson.databind.PropertyNamingStrategies;
 import com.fasterxml.jackson.databind.annotation.JsonNaming;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -30,7 +30,7 @@ import mjkf.xinke.main.model.vo.MaterialEditRequest;
  */
 @Getter
 @Setter
-@JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class)
+@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
 @FieldNameConstants
 @TableName("MATERIAL")
 @ApiModel(value = "Material对象", description = "材料")
diff --git a/src/main/java/mjkf/xinke/main/model/db/MaterialTask.java b/src/main/java/mjkf/xinke/main/model/db/MaterialTask.java
index eb2e1fa..169dbdd 100644
--- a/src/main/java/mjkf/xinke/main/model/db/MaterialTask.java
+++ b/src/main/java/mjkf/xinke/main/model/db/MaterialTask.java
@@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.io.Serializable;
 import java.time.LocalDateTime;
 
-import com.fasterxml.jackson.databind.PropertyNamingStrategy;
+import com.fasterxml.jackson.databind.PropertyNamingStrategies;
 import com.fasterxml.jackson.databind.annotation.JsonNaming;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -29,7 +29,7 @@ import mjkf.xinke.main.model.vo.MaterialTaskCreateRequest;
  */
 @Getter
 @Setter
-@JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class)
+@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
 @TableName(value="MATERIAL_TASK", autoResultMap=true)
 @ApiModel(value = "MaterialTask对象", description = "采集任务")
 public class MaterialTask extends Model<MaterialTask> {
diff --git a/src/main/java/mjkf/xinke/main/model/db/SanmingSteel.java b/src/main/java/mjkf/xinke/main/model/db/SanmingSteel.java
index 106ee6f..0fd0b8c 100644
--- a/src/main/java/mjkf/xinke/main/model/db/SanmingSteel.java
+++ b/src/main/java/mjkf/xinke/main/model/db/SanmingSteel.java
@@ -13,7 +13,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
-import org.apache.poi.ss.usermodel.CellType;
 import org.apache.poi.ss.usermodel.Row;
 
 /**
@@ -68,14 +67,14 @@ public class SanmingSteel extends Model<SanmingSteel> {
 
     public SanmingSteel (Row row, MaterialTask task) {
         var policy = Row.MissingCellPolicy.CREATE_NULL_AS_BLANK;
-        row.getCell(0).setCellType(CellType.STRING);
-        row.getCell(1).setCellType(CellType.STRING);
-        row.getCell(2).setCellType(CellType.STRING);
-        row.getCell(3).setCellType(CellType.NUMERIC);
-        this.setName(row.getCell(1, policy).getStringCellValue());
-        this.setSpec(row.getCell(2, policy).getStringCellValue());
-        this.setMaterial(row.getCell(0, policy).getStringCellValue());
-        this.setPrice(BigDecimal.valueOf(row.getCell(3, policy).getNumericCellValue()));
+        String material = row.getCell(0, policy).getStringCellValue();
+        String name = row.getCell(1, policy).getStringCellValue();
+        String spec = row.getCell(2, policy).getStringCellValue();
+        double price = row.getCell(3, policy).getNumericCellValue();
+        this.setName(name);
+        this.setSpec(spec);
+        this.setMaterial(material);
+        this.setPrice(BigDecimal.valueOf(price));
         //this.setFluctuating(BigDecimal.valueOf(row.getCell(4, policy).getNumericCellValue()));
         // this.setDate(row.getCell(5, policy).getLocalDateTimeCellValue().toLocalDate());
         this.setDate(LocalDate.of(task.getYear(), task.getMonth(), 1));  // 从任务获取日期
diff --git a/src/main/java/mjkf/xinke/main/model/db/SteelEntity.java b/src/main/java/mjkf/xinke/main/model/db/SteelEntity.java
index d88c9cd..1d840b6 100644
--- a/src/main/java/mjkf/xinke/main/model/db/SteelEntity.java
+++ b/src/main/java/mjkf/xinke/main/model/db/SteelEntity.java
@@ -3,6 +3,7 @@ package mjkf.xinke.main.model.db;
 
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.apache.poi.ss.usermodel.CellType;
 import org.apache.poi.ss.usermodel.Row;
 
@@ -10,6 +11,7 @@ import java.math.BigDecimal;
 import java.time.LocalDate;
 
 @Data
+@EqualsAndHashCode(callSuper = true)
 @Deprecated
 public class SteelEntity<T extends Model<?>> extends Model<T> {
     private String name;
@@ -20,7 +22,7 @@ public class SteelEntity<T extends Model<?>> extends Model<T> {
     private BigDecimal fluctuating;
     private LocalDate date;
 
-    public SteelEntity update(SteelEntity item) {
+    public SteelEntity<T> update(SteelEntity<T> item) {
         this.setName(item.getName());
         this.setSpec(item.getSpec());
         this.setMaterial(item.getMaterial());
diff --git a/src/main/java/mjkf/xinke/main/model/vo/BudgetCreateRequest.java b/src/main/java/mjkf/xinke/main/model/vo/BudgetCreateRequest.java
index d05d6b7..6f3cb3b 100644
--- a/src/main/java/mjkf/xinke/main/model/vo/BudgetCreateRequest.java
+++ b/src/main/java/mjkf/xinke/main/model/vo/BudgetCreateRequest.java
@@ -4,13 +4,9 @@ import cn.hutool.core.util.ObjectUtil;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import mjkf.xinke.main.model.db.BudgetItem;
 
 import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 @Data
 public class BudgetCreateRequest {
diff --git a/src/main/java/mjkf/xinke/main/model/vo/BudgetDetail.java b/src/main/java/mjkf/xinke/main/model/vo/BudgetDetail.java
index 69b6fbb..0d5afdb 100644
--- a/src/main/java/mjkf/xinke/main/model/vo/BudgetDetail.java
+++ b/src/main/java/mjkf/xinke/main/model/vo/BudgetDetail.java
@@ -4,9 +4,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 import mjkf.xinke.main.model.db.Budget;
 import mjkf.xinke.main.model.db.BudgetItem;
-import mjkf.xinke.main.model.db.LocalMaterial;
 
-import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.util.List;
 
diff --git a/src/main/java/mjkf/xinke/main/model/vo/PublicResponse.java b/src/main/java/mjkf/xinke/main/model/vo/PublicResponse.java
index 8f348a1..07c7c05 100644
--- a/src/main/java/mjkf/xinke/main/model/vo/PublicResponse.java
+++ b/src/main/java/mjkf/xinke/main/model/vo/PublicResponse.java
@@ -1,6 +1,6 @@
 package mjkf.xinke.main.model.vo;
 
-import com.fasterxml.jackson.databind.PropertyNamingStrategy;
+import com.fasterxml.jackson.databind.PropertyNamingStrategies;
 import com.fasterxml.jackson.databind.annotation.JsonNaming;
 import io.swagger.annotations.ApiModel;
 import lombok.Getter;
@@ -25,7 +25,7 @@ import java.util.stream.Collectors;
 @Getter
 @Setter
 @ApiModel(value = "PublicResponse对象", description = "计算结果")
-@JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class)
+@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
 public class PublicResponse {
     private String updateUserId;
 
diff --git a/src/main/java/mjkf/xinke/main/model/vo/PublicTrendResponse.java b/src/main/java/mjkf/xinke/main/model/vo/PublicTrendResponse.java
index 5a51dfd..0446554 100644
--- a/src/main/java/mjkf/xinke/main/model/vo/PublicTrendResponse.java
+++ b/src/main/java/mjkf/xinke/main/model/vo/PublicTrendResponse.java
@@ -1,6 +1,6 @@
 package mjkf.xinke.main.model.vo;
 
-import com.fasterxml.jackson.databind.PropertyNamingStrategy;
+import com.fasterxml.jackson.databind.PropertyNamingStrategies;
 import com.fasterxml.jackson.databind.annotation.JsonNaming;
 import io.swagger.annotations.ApiModel;
 import lombok.Getter;
@@ -10,7 +10,6 @@ import mjkf.xinke.main.model.db.PricePublish;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.List;
-import java.util.Map;
 import java.util.stream.Collectors;
 
 
@@ -25,7 +24,7 @@ import java.util.stream.Collectors;
 @Getter
 @Setter
 @ApiModel(value = "PublicResponse对象", description = "计算结果")
-@JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class)
+@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
 public class PublicTrendResponse {
     private String updateUserId;
 
diff --git a/src/main/java/mjkf/xinke/main/modular/ratioconcrete/entity/RatioConcrete.java b/src/main/java/mjkf/xinke/main/modular/ratioconcrete/entity/RatioConcrete.java
index 76dc48d..5bc199c 100644
--- a/src/main/java/mjkf/xinke/main/modular/ratioconcrete/entity/RatioConcrete.java
+++ b/src/main/java/mjkf/xinke/main/modular/ratioconcrete/entity/RatioConcrete.java
@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
-import java.math.BigDecimal;
 import java.util.Date;
 
 /**
diff --git a/src/main/java/mjkf/xinke/main/modular/ratioconcrete/param/RatioConcreteAddParam.java b/src/main/java/mjkf/xinke/main/modular/ratioconcrete/param/RatioConcreteAddParam.java
index cb674ca..0868be1 100644
--- a/src/main/java/mjkf/xinke/main/modular/ratioconcrete/param/RatioConcreteAddParam.java
+++ b/src/main/java/mjkf/xinke/main/modular/ratioconcrete/param/RatioConcreteAddParam.java
@@ -5,11 +5,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import java.math.BigDecimal;
-import java.util.Date;
-
 /**
  * 混凝土比例添加参数
  *
diff --git a/src/main/java/mjkf/xinke/main/modular/ratioconcrete/param/RatioConcreteEditParam.java b/src/main/java/mjkf/xinke/main/modular/ratioconcrete/param/RatioConcreteEditParam.java
index 276fa83..a8aad40 100644
--- a/src/main/java/mjkf/xinke/main/modular/ratioconcrete/param/RatioConcreteEditParam.java
+++ b/src/main/java/mjkf/xinke/main/modular/ratioconcrete/param/RatioConcreteEditParam.java
@@ -6,9 +6,6 @@ import lombok.Getter;
 import lombok.Setter;
 
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import java.math.BigDecimal;
-import java.util.Date;
 
 /**
  * 混凝土比例编辑参数
diff --git a/src/main/java/mjkf/xinke/main/modular/ratioconcrete/param/RatioConcretePageParam.java b/src/main/java/mjkf/xinke/main/modular/ratioconcrete/param/RatioConcretePageParam.java
index 0d27804..e5fd954 100644
--- a/src/main/java/mjkf/xinke/main/modular/ratioconcrete/param/RatioConcretePageParam.java
+++ b/src/main/java/mjkf/xinke/main/modular/ratioconcrete/param/RatioConcretePageParam.java
@@ -4,8 +4,6 @@ package mjkf.xinke.main.modular.ratioconcrete.param;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
-import java.math.BigDecimal;
-import java.util.Date;
 
 /**
  * 混凝土比例查询参数
diff --git a/src/main/java/mjkf/xinke/main/modular/ratioconcrete/service/RatioConcreteService.java b/src/main/java/mjkf/xinke/main/modular/ratioconcrete/service/RatioConcreteService.java
index 231e3fb..7907e93 100644
--- a/src/main/java/mjkf/xinke/main/modular/ratioconcrete/service/RatioConcreteService.java
+++ b/src/main/java/mjkf/xinke/main/modular/ratioconcrete/service/RatioConcreteService.java
@@ -31,7 +31,7 @@ public class RatioConcreteService extends ServiceImpl<BaseMapper<RatioConcrete>,
 
 
     public Page<RatioConcrete> page(RatioConcretePageParam ratioConcretePageParam) {
-        QueryWrapper queryWrapper = this.getQuery(ratioConcretePageParam);
+        var queryWrapper = this.getQuery(ratioConcretePageParam);
         return this.page(CommonPageRequest.defaultPage(), queryWrapper);
     }
 
diff --git a/src/test/java/mjkf/xinke/UploadFileTest.java b/src/test/java/mjkf/xinke/UploadFileTest.java
index c60ee33..7447436 100644
--- a/src/test/java/mjkf/xinke/UploadFileTest.java
+++ b/src/test/java/mjkf/xinke/UploadFileTest.java
@@ -1,6 +1,5 @@
 package mjkf.xinke;
 
-import cn.hutool.core.io.FileUtil;
 import mjkf.xinke.dev.modular.file.enums.DevFileEngineTypeEnum;
 import mjkf.xinke.dev.modular.file.service.DevFileService;
 import org.junit.Test;
@@ -14,7 +13,6 @@ import javax.annotation.Resource;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
-import java.net.URLConnection;
 import java.nio.file.Files;
 import java.nio.file.Path;