From ef47488abe2aa88fff9ea084e32a05b2a1f60224 Mon Sep 17 00:00:00 2001 From: wgx <31655391@qq.com> Date: Tue, 24 Mar 2026 15:13:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=88=97=E8=A1=A8=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E5=8E=9F=E5=A7=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/jeecg/common/entity/SurvHisdataAir.java | 12 ++++++------ .../jeecg/common/entity/SurvHisdataSoil.java | 17 ++++++----------- 2 files changed, 12 insertions(+), 17 deletions(-) diff --git a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvHisdataAir.java b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvHisdataAir.java index 0a33637..9671a86 100644 --- a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvHisdataAir.java +++ b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvHisdataAir.java @@ -36,15 +36,15 @@ public class SurvHisdataAir implements Serializable { @ApiModelProperty(value = "主键") private String id; /**租户号*/ - @Excel(name = "租户号", width = 15) +// @Excel(name = "租户号", width = 15) @ApiModelProperty(value = "租户号") private String tenantId; /**乐观锁*/ - @Excel(name = "乐观锁", width = 15) +// @Excel(name = "乐观锁", width = 15) @ApiModelProperty(value = "乐观锁") private Integer reVision; /**创建人*/ - @Excel(name = "创建人", width = 15) +// @Excel(name = "创建人", width = 15) @ApiModelProperty(value = "创建人") private String createdBy; /**创建时间*/ @@ -53,15 +53,15 @@ public class SurvHisdataAir implements Serializable { @ApiModelProperty(value = "创建时间") private Date createTime; /**更新人*/ - @Excel(name = "更新人", width = 15) +// @Excel(name = "更新人", width = 15) @ApiModelProperty(value = "更新人") private String updatedBy; /**逻辑删除*/ - @Excel(name = "逻辑删除", width = 15) +// @Excel(name = "逻辑删除", width = 15) @ApiModelProperty(value = "逻辑删除") private Integer isDel; /**更新时间*/ - @Excel(name = "更新时间", width = 15, format = "yyyy-MM-dd") +// @Excel(name = "更新时间", width = 15, format = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "更新时间") diff --git a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvHisdataSoil.java b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvHisdataSoil.java index d0d5b58..a4c4586 100644 --- a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvHisdataSoil.java +++ b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvHisdataSoil.java @@ -36,15 +36,15 @@ public class SurvHisdataSoil implements Serializable { @ApiModelProperty(value = "主键") private String id; /**租户号*/ - @Excel(name = "租户号", width = 15) +// @Excel(name = "租户号", width = 15) @ApiModelProperty(value = "租户号") private String tenantId; /**乐观锁*/ - @Excel(name = "乐观锁", width = 15) +// @Excel(name = "乐观锁", width = 15) @ApiModelProperty(value = "乐观锁") private Integer reVision; /**创建人*/ - @Excel(name = "创建人", width = 15) +// @Excel(name = "创建人", width = 15) @ApiModelProperty(value = "创建人") private String createdBy; /**创建时间*/ @@ -53,15 +53,15 @@ public class SurvHisdataSoil implements Serializable { @ApiModelProperty(value = "创建时间") private Date createTime; /**更新人*/ - @Excel(name = "更新人", width = 15) +// @Excel(name = "更新人", width = 15) @ApiModelProperty(value = "更新人") private String updatedBy; /**逻辑删除*/ - @Excel(name = "逻辑删除", width = 15) +// @Excel(name = "逻辑删除", width = 15) @ApiModelProperty(value = "逻辑删除") private Integer isDel; /**更新时间*/ - @Excel(name = "更新时间", width = 15, format = "yyyy-MM-dd") +// @Excel(name = "更新时间", width = 15, format = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "更新时间") @@ -120,9 +120,6 @@ public class SurvHisdataSoil implements Serializable { @ApiModelProperty(value = "ph") private String dataSoilPh; - - - /** * 氮离子 */ @@ -270,8 +267,6 @@ public class SurvHisdataSoil implements Serializable { @TableField(value = "data_water_do") private String dataWaterDo; - - /**数据更新时间*/ @Excel(name = "数据更新时间", width = 15, format = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")