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

shuili-system/src/main/java/com/kms/yxgh/base/domain/sk/AttResSw.java

@@ -3,10 +3,12 @@ package com.kms.yxgh.base.domain.sk;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.shuili.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.util.Date;
 
 
@@ -19,7 +21,8 @@ import java.util.Date;
 @TableName("att_res_sw")
 @Data
 @ApiModel("水库溢洪道表")
-public class AttResSw {
+public class AttResSw extends BaseEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
 
     /**
      * 水库编码

shuili-system/src/main/java/com/kms/yxgh/base/domain/sk/SkAttDamBase.java

@@ -3,17 +3,19 @@ package com.kms.yxgh.base.domain.sk;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.shuili.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.util.Date;
 
 @TableName("att_dam_base")
 @Data
 @ApiModel("水库大坝基础信息表")
-public class SkAttDamBase {
-
+public class SkAttDamBase extends BaseEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
     /**
      * 大坝代码
      */

shuili-system/src/main/java/com/kms/yxgh/base/domain/sk/SkRelStRes.java

@@ -2,15 +2,17 @@ package com.kms.yxgh.base.domain.sk;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.shuili.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
+import java.io.Serializable;
 import java.util.Date;
 @TableName("dw_rel_st_res")
 @Data
 @ApiModel("代表站")
-public class SkRelStRes  {
-
+public class SkRelStRes  extends BaseEntity implements Serializable {
     private static final long serialVersionUID = 1L;
 
 
@@ -39,14 +41,14 @@ public class SkRelStRes  {
      * 河流代码
      */
     @ApiModelProperty("测站代码")
-    @JSONField(name = "ST_CODE")
+    @JSONField(name = "STCD")
     private String stCode;
 
     /**
      * 河流名称
      */
     @ApiModelProperty("测站名称")
-    @JSONField(name = "ST_NAME")
+    @JSONField(name = "STNM")
     private String stName;
 
     /**