diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/entity/BsDosingRecEntity.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/entity/BsDosingRecEntity.java index 2bb767b2..fc87ce31 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/entity/BsDosingRecEntity.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/entity/BsDosingRecEntity.java @@ -73,8 +73,8 @@ public class BsDosingRecEntity extends BaseEntity { * 加药时间 */ @Schema(description = "加药时间") - @JsonFormat(pattern = DateUtil.PATTERN_DATE) - @DateTimeFormat(pattern = DateUtil.PATTERN_DATE) + @JsonFormat(pattern = DateUtil.PATTERN_DATETIME) + @DateTimeFormat(pattern = DateUtil.PATTERN_DATETIME) private Date dosingTime; /** * 加药人 @@ -89,18 +89,18 @@ public class BsDosingRecEntity extends BaseEntity { /** * 处理类型 */ - @Schema(description = "处理类型") + //@Schema(description = "处理类型") private Long handleResult; /** * 类型:1、废气加药;2、废水加药 */ - @Schema(description = "类型:1、废气加药;2、废水加药") + //@Schema(description = "类型:1、废气加药;2、废水加药") private String dorType; /** * 酸雾塔 */ - @Schema(description = "酸雾塔") + //@Schema(description = "酸雾塔") private Long btId; } diff --git a/blade-service/blade-desk/src/main/resources/Excel/QA/加药记录导入模板.xls b/blade-service/blade-desk/src/main/resources/Excel/QA/加药记录导入模板.xls index 29b18031..5995b724 100644 Binary files a/blade-service/blade-desk/src/main/resources/Excel/QA/加药记录导入模板.xls and b/blade-service/blade-desk/src/main/resources/Excel/QA/加药记录导入模板.xls differ