分包合同修改

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;