From 56f17ae8d258f6cdf121c577fe2507df203d751a Mon Sep 17 00:00:00 2001
From: zhuyulei <fanwenjun@qq.com>
Date: Tue, 24 Oct 2023 17:33:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=8C=85=E5=90=88=E5=90=8C=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kms/build/domain/BsSgcJsjdBuiContSubcontracts.java   | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiContSubcontracts.java b/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiContSubcontracts.java
index a8551cb8..70b03ab3 100644
--- a/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiContSubcontracts.java
+++ b/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiContSubcontracts.java
@@ -33,10 +33,10 @@ public class BsSgcJsjdBuiContSubcontracts extends BaseEntity
     private String subcontractingAgreement;
 
     /** 分包合同名称 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "分包合同名称", width = 30, dateFormat = "yyyy-MM-dd")
+
+    @Excel(name = "分包合同名称")
     @ApiModelProperty("分包合同名称")
-    private Date subcontractName;
+    private String subcontractName;
 
     /** 分包类型 */
     @Excel(name = "分包类型")
@@ -54,7 +54,8 @@ public class BsSgcJsjdBuiContSubcontracts extends BaseEntity
     private String contractingCompany;
 
     /** 分包时间 */
-    @Excel(name = "分包时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "分包时间", width = 30, dateFormat = "yyyy-MM-dd")
     @ApiModelProperty("分包时间")
     private String subcontractingTime;