From b7d5b529707e5bd98ec334c1be4b13c21e69f6e6 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Tue, 22 Aug 2023 17:56:14 +0800
Subject: [PATCH] 水库填报修改

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResStagChar.java |   29 +++++++++++++++++++----------
 1 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResStagChar.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResStagChar.java
index 4fcf21c..4143e1b 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResStagChar.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResStagChar.java
@@ -281,12 +281,21 @@
 
 
 	/**
+	 * 前汛期开始时间
+	 */
+	@ApiModelProperty(value = "前汛期开始时间 ")
+	@TableField("\"before_flood_start\"")
+	@DateTimeFormat(pattern = "MM-dd")
+	@JsonFormat(pattern = "MM-dd")
+	private Date beforeFloodStart;
+
+	/**
 	 * 前汛期结束时间
 	 */
 	@ApiModelProperty(value = "前汛期结束时间 ")
 	@TableField("\"before_flood_end\"")
-	@DateTimeFormat(pattern = "yyyy-MM-dd")
-	@JsonFormat(pattern = "yyyy-MM-dd")
+	@DateTimeFormat(pattern = "MM-dd")
+	@JsonFormat(pattern = "MM-dd")
 	private Date beforeFloodEnd;
 
 	/**
@@ -294,8 +303,8 @@
 	 */
 	@ApiModelProperty(value = "中汛期开始时间 ")
 	@TableField("\"mid_flood_start\"")
-	@DateTimeFormat(pattern = "yyyy-MM-dd")
-	@JsonFormat(pattern = "yyyy-MM-dd")
+	@DateTimeFormat(pattern = "MM-dd")
+	@JsonFormat(pattern = "MM-dd")
 	private Date midFloodStart;
 
 	/**
@@ -303,8 +312,8 @@
 	 */
 	@ApiModelProperty(value = "中汛期结束时间 ")
 	@TableField("\"mid_flood_end\"")
-	@DateTimeFormat(pattern = "yyyy-MM-dd")
-	@JsonFormat(pattern = "yyyy-MM-dd")
+	@DateTimeFormat(pattern = "MM-dd")
+	@JsonFormat(pattern = "MM-dd")
 	private Date midFloodEnd;
 
 	/**
@@ -312,8 +321,8 @@
 	 */
 	@ApiModelProperty(value = "后汛期开始时间 ")
 	@TableField("\"after_flood_start\"")
-	@DateTimeFormat(pattern = "yyyy-MM-dd")
-	@JsonFormat(pattern = "yyyy-MM-dd")
+	@DateTimeFormat(pattern = "MM-dd")
+	@JsonFormat(pattern = "MM-dd")
 	private Date afterFloodStart;
 
 	/**
@@ -321,8 +330,8 @@
 	 */
 	@ApiModelProperty(value = "后汛期结束时间 ")
 	@TableField("\"after_flood_end\"")
-	@DateTimeFormat(pattern = "yyyy-MM-dd")
-	@JsonFormat(pattern = "yyyy-MM-dd")
+	@DateTimeFormat(pattern = "MM-dd")
+	@JsonFormat(pattern = "MM-dd")
 	private Date afterFloodEnd;
 
 	/**

--
Gitblit v1.9.3