From ff6f8f0b00136dfab053d78826e876e15bf9e9dd Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 26 May 2023 20:46:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttResFlseLim.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttResFlseLim.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttResFlseLim.java
index 33cf4cb..c2c1e2b 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttResFlseLim.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttResFlseLim.java
@@ -45,11 +45,11 @@
 
 	@ApiModelProperty(value = "填报汛期开始时间")
 	@TableField("\"tb_flood_season_start\"")
-	private BigDecimal tbFloodSeasonStart;
+	private String tbFloodSeasonStart;
 
 	@ApiModelProperty(value = "填报汛期结束时间")
 	@TableField("\"tb_flood_season_end\"")
-	private BigDecimal tbFloodSeasonEnd;
+	private String tbFloodSeasonEnd;
 
 	/**
 	 * 更新时间

--
Gitblit v1.9.3