From e214f8348ad055d88980b77c6538af58d74ed437 Mon Sep 17 00:00:00 2001
From: dongdingding <207595406@qq.com>
Date: Mon, 30 Oct 2023 11:29:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=80=9A=E6=8A=A5=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90=E5=AE=9E=E4=BD=93=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcTbwc.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcTbwc.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcTbwc.java
index b426a656..7a03553d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcTbwc.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcTbwc.java
@@ -49,8 +49,6 @@ public class TcTbwc extends BaseEntity
 
     /** 年份 */
     @Excel(name = "年份", dateFormat = "yyyy")
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy")
     @ApiModelProperty(value = "年份")
-    private Date year;
+    private String year;
 }