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

xieb

2023-10-19 1dd5d8f8a616f5cf3caa7828d46989c7d3dcafc4

 skjcmanager/skjcmanager-service-api/skjcmanager-nky-api/src/main/java/cn/gistack/nky/entity/HstPredict.java

@@ -37,8 +37,11 @@
   /**
    * 数据
    */
   @TableField(value = "data",typeHandler = FastjsonTypeHandler.class)
   private Object data;
   @TableField(value = "PREDICT_LIST",typeHandler = FastjsonTypeHandler.class)
   private Object predictList;

   @TableField(value = "PRE_WATER_LIST",typeHandler = FastjsonTypeHandler.class)
   private Object preWaterList;

   /**
    * 时间