From 12213c5125aa535811a2b882ea0e78d7e8ee1f8f Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期二, 14 七月 2026 17:43:33 +0800
Subject: [PATCH] Merge branch 'master' into master-任务组

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

diff --git a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskStatistic.java b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskStatistic.java
index fbc41e7..96ce09f 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskStatistic.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskStatistic.java
@@ -102,6 +102,9 @@
     @Excel(name = " 搴旈殢璁夸汉娆� ")
     private Long followUpNeeded = 0L;
 
+    @ApiModelProperty(value = "棣栨鏃犻渶闅忚")
+    private Long nonFollowUpFirst = 0L;
+
     @ApiModelProperty(value = "棣栨搴旈殢璁�")
     @Excel(name = " 棣栨搴旈殢璁� ")
     private Long needFollowUp = 0L;
@@ -228,6 +231,10 @@
     @Excel(name = " 浜屾搴旈殢璁� ")
     private Long needFollowUpAgain = 0L;
 
+    @ApiModelProperty(value = "浜屾鏃犻渶闅忚")
+    @Excel(name = " 浜屾鏃犻渶闅忚 ")
+    private Long nonFollowUpAgain = 0L;
+
     @ApiModelProperty(value = "浜屾寰呴殢璁�")
     @Excel(name = " 浜屾寰呴殢璁� ")
     private Long pendingFollowUpAgain = 0L;

--
Gitblit v1.9.3