From 6593c5873466a8db2dc6790767601d96d0785381 Mon Sep 17 00:00:00 2001 From: wgx <31655391@qq.com> Date: Tue, 24 Mar 2026 17:03:42 +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 --- .../entity/SurvHisdataLivestockwater.java | 17 +++++++---------- .../common/entity/SurvHisdataOrientwater.java | 18 +++++++----------- 2 files changed, 14 insertions(+), 21 deletions(-) diff --git a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvHisdataLivestockwater.java b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvHisdataLivestockwater.java index e637f75..4a9f2ca 100644 --- a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvHisdataLivestockwater.java +++ b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvHisdataLivestockwater.java @@ -35,15 +35,15 @@ public class SurvHisdataLivestockwater 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; /**创建时间*/ @@ -52,21 +52,21 @@ public class SurvHisdataLivestockwater 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 = "更新时间") private Date updatedTime; /**数据ID*/ - @Excel(name = "数据ID", width = 15) +// @Excel(name = "数据ID", width = 15) @ApiModelProperty(value = "数据ID") private String dataId; /**总磷*/ @@ -132,9 +132,6 @@ public class SurvHisdataLivestockwater implements Serializable { @Excel(name = "硝态氮", width = 15) @ApiModelProperty(value = "硝态氮") private String dataWaterNoLd; - - - /**液位*/ @Excel(name = "液位", width = 15) @ApiModelProperty(value = "液位") diff --git a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvHisdataOrientwater.java b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvHisdataOrientwater.java index a49f1bd..630b1ec 100644 --- a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvHisdataOrientwater.java +++ b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvHisdataOrientwater.java @@ -35,15 +35,15 @@ public class SurvHisdataOrientwater 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; /**创建时间*/ @@ -52,21 +52,21 @@ public class SurvHisdataOrientwater 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 = "更新时间") private Date updatedTime; /**数据ID*/ - @Excel(name = "数据ID", width = 15) +// @Excel(name = "数据ID", width = 15) @ApiModelProperty(value = "数据ID") private String dataId; /**总磷*/ @@ -203,14 +203,10 @@ public class SurvHisdataOrientwater implements Serializable { @ApiModelProperty(value = "转储时间") private Date transDate; - - - /**站点名称*/ @Excel(name = "站点名称", width = 15) @ApiModelProperty(value = "站点名称") private String stationName; - /** * 数据类型 */