From 52a302b11c08cbc564ff3931038ae57a305a95d6 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期二, 23 一月 2024 09:23:52 +0800
Subject: [PATCH] 修改

---
 modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrder.java |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrder.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrder.java
index 5f3b574..db3d983 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrder.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrder.java
@@ -27,7 +27,6 @@
 	@ApiModelProperty(value = "椤圭洰ID")
 	private Long projectId;
 
-
 	@ApiModelProperty(value = "濮旀墭鍗曠紪鍙�")
 	private String code;
 
@@ -81,7 +80,7 @@
 	private Date deliveryDate;
 
 	@ApiModelProperty(value = "妫�娴嬭垂鐢�")
-	private Integer testCost;
+	private String testCost;
 
 	@ApiModelProperty(value = "鐗╁搧鎬ц川")
 	private String articleNature;
@@ -120,13 +119,15 @@
 	private String entrustSign;
 
 	@ApiModelProperty(value = "濮旀墭鏂圭瀛楁棩鏈�")
-	private String entrustSignDate;
+	@JsonFormat(pattern = "yyyy-MM-dd")
+	private Date entrustSignDate;
 
 	@ApiModelProperty(value = "鎵挎墭鏂圭瀛�")
 	private String contractSign;
 
 	@ApiModelProperty(value = "鎵挎墭鏂圭瀛楁棩鏈�")
-	private String contractSignDate;
+	@JsonFormat(pattern = "yyyy-MM-dd")
+	private Date contractSignDate;
 
 	@TableField(exist = false)
 	@ApiModelProperty(value = "濮旀墭鍗曚綅鍚嶇О")
@@ -267,4 +268,8 @@
 	@TableField(exist = false)
 	@ApiModelProperty(value = "鏍峰搧鐘舵�佸瓧绗︿覆")
 	String sampleStatusStr;
+
+	@TableField(exist = false)
+	@ApiModelProperty(value = "瀵嗙骇瀛楃涓�")
+	String secretClassStr;
 }

--
Gitblit v1.9.1