From f20fad8125774e487e133e909b323b43bd11db24 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期一, 03 三月 2025 20:40:15 +0800
Subject: [PATCH] Merge branch 'master' into dev
---
business/src/main/java/com/ycl/domain/form/ProjectEngineeringForm.java | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/business/src/main/java/com/ycl/domain/form/ProjectEngineeringForm.java b/business/src/main/java/com/ycl/domain/form/ProjectEngineeringForm.java
index 736b975..02225dd 100644
--- a/business/src/main/java/com/ycl/domain/form/ProjectEngineeringForm.java
+++ b/business/src/main/java/com/ycl/domain/form/ProjectEngineeringForm.java
@@ -53,8 +53,7 @@
private Long unit;
@ApiModelProperty("骞翠唤")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date year;
+ private String year;
@ApiModelProperty("鐖跺伐绋�")
private String parent;
--
Gitblit v1.8.0