From 3e2ae8bd7aefb12f5521e49c3bb5c773ef525cae Mon Sep 17 00:00:00 2001 From: guoshilong <123456> Date: Thu, 28 Dec 2023 19:57:59 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev --- skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResRsbNorspi.java | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResRsbNorspi.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResRsbNorspi.java index c9dd48e..bcc90c4 100644 --- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResRsbNorspi.java +++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResRsbNorspi.java @@ -58,7 +58,7 @@ */ @ApiModelProperty(value = "正常溢洪道型式") @TableField(value = "\"spillway_type\"",fill = FieldFill.UPDATE) - private Integer spillwayType; + private String spillwayType; /** * 是否位于坝身 @@ -93,7 +93,7 @@ */ @ApiModelProperty(value = "工作闸门型式") @TableField(value = "\"working_gate_type\"",fill = FieldFill.UPDATE) - private Integer workingGateType; + private String workingGateType; /** * 闸门数量 @@ -128,7 +128,7 @@ */ @ApiModelProperty(value = "启闭方式") @TableField(value = "\"oc_type\"",fill = FieldFill.UPDATE) - private Integer ocType; + private String ocType; /** * 启闭动力 @@ -142,7 +142,7 @@ */ @ApiModelProperty(value = "消能方式") @TableField(value = "\"dis_energy_type\"",fill = FieldFill.UPDATE) - private Integer disEnergyType; + private String disEnergyType; /** * 填报状态（0:填写中，1:审核中，2:审核通过） -- Gitblit v1.9.3