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/TbAttResWaterBlock.java

@@ -149,7 +149,7 @@
    */
   @ApiModelProperty(value = "坝基防渗型式")
   @TableField(value="\"dam_body_type\"",fill = FieldFill.UPDATE)
   private Integer damBodyType;
   private String damBodyType;

   /**
    * 副坝座数