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

aix

2024-08-28 f142d48409503dfd6b11d7d414c0ee7ffa85eed5

 skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sjztods/entity/WaterDataTermites.java

@@ -23,6 +23,13 @@
    */
   @ApiModelProperty(value = "设备id")
   @TableField("\"device_id\"")
   private String deviceId;
   private Integer deviceId;

   /**
    * 设备id
    */
   @ApiModelProperty(value = "设备id")
   @TableField("\"order\"")
   private String order;

}