From 1dd5d8f8a616f5cf3caa7828d46989c7d3dcafc4 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Thu, 19 Oct 2023 15:01:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev

---
 skjcmanager/skjcmanager-service-api/skjcmanager-nky-api/src/main/java/cn/gistack/nky/entity/HstPredict.java |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/skjcmanager/skjcmanager-service-api/skjcmanager-nky-api/src/main/java/cn/gistack/nky/entity/HstPredict.java b/skjcmanager/skjcmanager-service-api/skjcmanager-nky-api/src/main/java/cn/gistack/nky/entity/HstPredict.java
index fe0147a..4b4be0a 100644
--- a/skjcmanager/skjcmanager-service-api/skjcmanager-nky-api/src/main/java/cn/gistack/nky/entity/HstPredict.java
+++ b/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;
 
 	/**
 	 * 时间

--
Gitblit v1.9.3