From 7191c6d38f03f2e1baf39f959227ce9c038e4e96 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 03 十一月 2026 14:39:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into smartor_ls_261012

---
 ruoyi-task/src/main/java/com/ruoyi/task/domain/ServiceSubtaskCountReq.java |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/ruoyi-task/src/main/java/com/ruoyi/task/domain/ServiceSubtaskCountReq.java b/ruoyi-task/src/main/java/com/ruoyi/task/domain/ServiceSubtaskCountReq.java
index 1dc4a6a..ce4902a 100644
--- a/ruoyi-task/src/main/java/com/ruoyi/task/domain/ServiceSubtaskCountReq.java
+++ b/ruoyi-task/src/main/java/com/ruoyi/task/domain/ServiceSubtaskCountReq.java
@@ -238,6 +238,18 @@
     private String excep;
 
     /**
+     * 澶勭悊鎰忚缂栫爜 - 瓒呴摼鎺ョ粺璁�
+     */
+    @ApiModelProperty(value = "澶勭悊鎰忚缂栫爜")
+    private String suggest;
+
+    /**
+     * 瀹屾垚鏃剁姸鎬� - 瓒呴摼鎺ョ粺璁★紙1-姝e父瀹屾垚 2-寤舵湡瀹屾垚 3-瓒呮椂瀹屾垚锛�
+     */
+    @ApiModelProperty(value = "瀹屾垚鏃剁姸鎬侊細1姝e父瀹屾垚 2寤舵湡瀹屾垚 3瓒呮椂瀹屾垚")
+    private Long finishState;
+
+    /**
      * 褰撳墠鍙戦�佹柟寮� - 瓒呴摼鎺ョ粺璁�
      */
     @ApiModelProperty("褰撳墠鍙戦�佹柟寮�")
@@ -297,6 +309,12 @@
     private String hospType;
 
     /**
+     * 浜哄伐鐢佃瘽鏍囪
+     */
+    @ApiModelProperty(value = "鏄惁浜哄伐鎵撹繃鐢佃瘽 0-娌℃墦杩� 1-鎵撹繃")
+    private Long isManuallyCalled;
+
+    /**
      * pageNum
      */
     @ApiModelProperty("pageNum")

--
Gitblit v1.9.3