diff --git a/src/main/java/com/gunshi/project/xyt/entity/vo/StWaterRVo.java b/src/main/java/com/gunshi/project/xyt/entity/vo/StWaterRVo.java index e306f80..06e8e0c 100644 --- a/src/main/java/com/gunshi/project/xyt/entity/vo/StWaterRVo.java +++ b/src/main/java/com/gunshi/project/xyt/entity/vo/StWaterRVo.java @@ -7,6 +7,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.gunshi.core.dateformat.DateFormatString; import lombok.Data; +import java.math.BigDecimal; import java.util.Date; /** @@ -29,8 +30,8 @@ public class StWaterRVo { private Date tm; @ExcelProperty({"${title}", "流量(m³/s)"}) - private String q; + private BigDecimal q; @ExcelProperty({"${title}", "水量(m³)"}) - private String v; + private BigDecimal v; } diff --git a/src/main/java/com/gunshi/project/xyt/model/StWaterR.java b/src/main/java/com/gunshi/project/xyt/model/StWaterR.java index d24eece..257d4a5 100644 --- a/src/main/java/com/gunshi/project/xyt/model/StWaterR.java +++ b/src/main/java/com/gunshi/project/xyt/model/StWaterR.java @@ -57,7 +57,7 @@ public class StWaterR extends GenericPageParams implements Serializable { @TableField(value="q") @Schema(description="流量") // @Size(max = 0,message = "流量最大长度要小于 0") - private String q; + private BigDecimal q; /** * 水量