Commit 2f108f68 authored by tangwei's avatar tangwei

修改bug

parent e772e02e
...@@ -263,7 +263,7 @@ public class WaterResourceDto extends BaseDto { ...@@ -263,7 +263,7 @@ public class WaterResourceDto extends BaseDto {
@ExplicitConstraint(indexNum = 32, source = {"有", "无"}) //固定下拉内容 @ExplicitConstraint(indexNum = 32, source = {"有", "无"}) //固定下拉内容
@ExcelProperty(value = "有无枯水期", index = 32) @ExcelProperty(value = "有无枯水期", index = 32)
@ApiModelProperty(value = "有无枯水期") @ApiModelProperty(value = "有无枯水期")
private Boolean hasDrySeasonType; private String hasDrySeasonType;
......
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
rn.quality_situation_info, rn.quality_situation_info,
rn.season_change_info, rn.season_change_info,
rn.has_dry_season, rn.has_dry_season,
(case r.has_dry_season when 0 then '有' when 1 then '无' end) hasDrySeasonType, (case rn.has_dry_season when 0 then '有' when 1 then '无' end) hasDrySeasonType,
rn.dry_period_span, rn.dry_period_span,
rp.intake_height, rp.intake_height,
rp.elevation_difference, rp.elevation_difference,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment