Merge remote-tracking branch 'origin/jtdev' into jtdev

guoshilong

2023-12-28 3e2ae8bd7aefb12f5521e49c3bb5c773ef525cae

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResRsbVerspi.java

@@ -58,7 +58,7 @@
    */
   @ApiModelProperty(value = "非常溢洪道型式")
   @TableField(value = "\"spillway_type\"",fill = FieldFill.UPDATE)
   private Integer spillwayType;
   private String spillwayType;

   /**
    * 溢流段长