From c80aedf517205fd50e608efc17ead73a3667d506 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期五, 02 八月 2024 15:39:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/Task.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/Task.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/Task.java
index de9e858..5ef6553 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/Task.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/Task.java
@@ -28,8 +28,8 @@
 	@ApiModelProperty(value = "浠诲姟鍚嶇О")
 	private String taskName;
 
-	@ApiModelProperty(value = "浠诲姟椤哄簭")
-	private Integer taskSort;
+/*	@ApiModelProperty(value = "浠诲姟椤哄簭")
+	private Integer taskSort;*/
 
 	@ApiModelProperty(value = "澶囨敞")
 	private String remark;
@@ -37,5 +37,7 @@
 	@TableField(exist = false)
 	private String name;
 
+	private Double taskDuration;
+
 
 }

--
Gitblit v1.9.1