From 36c95e19d39eb855c7a3ae23b4468d5cd3cb88ed Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 30 十月 2025 18:24:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 smartor/src/main/java/com/smartor/domain/ServiceSubtask.java |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java b/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java
index e0ac5c6..5730755 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java
@@ -633,16 +633,15 @@
     @ApiModelProperty(value = "ps")
     private Integer ps;
 
-
-    /**
-     * 鎮h�呮潵婧�
-     */
     @ApiModelProperty(value = "缁忕鍖荤敓缂栫爜")
     private String managementDoctorCode;
 
-    /**
-     * 鎮h�呮潵婧�
-     */
     @ApiModelProperty(value = "缁忕鍖荤敓")
     private String managementDoctor;
+
+    @ApiModelProperty(value = "闅忚鎯呭喌:1姝e父璇煶,2鎮h�呮嫆鎺ユ垨鎷掕,3闈㈣鎴栬�呮帴璇�,4寰俊闅忚,5闅忚鐢佃瘽涓嶆纭�,6鍏朵粬")
+    private Integer taskSituation;
+
+    @ApiModelProperty(value = "寮傚父棰勮锛�0缁胯壊锛�1绾㈣壊锛�2榛勮壊")
+    private Integer isabnormal;
 }

--
Gitblit v1.9.3