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

guoshilong

2023-09-11 b6a42ed2c7bb93651a9a026afb3ee83449ed8256

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

@@ -61,7 +61,7 @@
    */
   @ApiModelProperty(value = "输水道型式")
   @TableField("\"aqueduct_type\"")
   private Integer aqueductType;
   private String aqueductType;

   /**
    * 输水道长度