From e48a56c2171f023f1978b0b6aec9befd43e7a9dc Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期一, 04 十一月 2024 08:45:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/Task.java |    4 ++--
 1 files changed, 2 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 2314a30..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;

--
Gitblit v1.9.1