From 659d3e60c6fe5e5bcd8c4cbb3dd8077e29f13a38 Mon Sep 17 00:00:00 2001 From: ke <893754509@qq.com> Date: Mon, 13 May 2024 18:54:27 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev --- skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResPowerStation.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResPowerStation.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResPowerStation.java index 33c7abb..323d901 100644 --- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResPowerStation.java +++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResPowerStation.java @@ -65,14 +65,14 @@ */ @ApiModelProperty(value = "装机容量") @TableField(value = "\"installed_capacity\"",fill = FieldFill.UPDATE) - private Integer installedCapacity; + private double installedCapacity; /** * 平均年利用小时 */ @ApiModelProperty(value = "平均年利用小时") @TableField(value = "\"year_avg_hour\"",fill = FieldFill.UPDATE) - private Integer yearAvgHour; + private double yearAvgHour; /** * 填报状态（0:填写中，1:审核中，2:审核通过） -- Gitblit v1.9.3