Merge remote-tracking branch 'origin/release-sy-v1.0.0' into release-sy-v1.0.0

1 year ago · 92043997c9
1 changed files with 2 additions and 2 deletions
--- a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzWaterRegime.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzWaterRegime.java
@ -33,10 +33,10 @@ public class SzWaterRegime extends SyBaseEntity {
    private String remark;

    @ApiModelProperty("状态")
-    private Integer status;
+    private String status;

    @ApiModelProperty("闸门状态")
-    private Integer doorStatus;
+    private String doorStatus;

    @ApiModelProperty("天气情况")
    private String weatherCondition;