From 18a0a77e049bfc29a957b36201f9ae6a582719eb Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 25 三月 2026 16:07:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
smartor/src/main/java/com/smartor/domain/ServiceSubtask.java | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java b/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java
index 1032473..17b297f 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java
@@ -244,8 +244,8 @@
/**
* 鍙戦�佺姸鎬�
*/
-// @Excel(name = " 鍙戦�佺姸鎬� 1 琚鍙�(鍦ㄤ换鍔′腑鏄柊寤猴紝鍦ㄦ湇鍔′腑鏄棰嗗彇) 2 寰呭彂閫� 3 宸插彂閫� 4 涓嶆墽琛� 5 鍙戦�佸け璐� 6 宸插畬鎴怽") ")
- @ApiModelProperty(value = "鍙戦�佺姸鎬� 1 琚鍙�(鍦ㄤ换鍔′腑鏄柊寤猴紝鍦ㄦ湇鍔′腑鏄棰嗗彇) 2 寰呭彂閫� 3 宸插彂閫� 4 涓嶆墽琛� 5 鍙戦�佸け璐� 6 宸插畬鎴�")
+// @Excel(name = " 鍙戦�佺姸鎬� 1 琚鍙�(鍦ㄤ换鍔′腑鏄柊寤猴紝鍦ㄦ湇鍔′腑鏄棰嗗彇) 2 寰呭彂閫� 3 宸插彂閫� 4 涓嶆墽琛� 5 鍙戦�佸け璐� 6 宸插畬鎴� 7 瓒呮椂(浜哄伐)\") ")
+ @ApiModelProperty(value = "鍙戦�佺姸鎬� 1 琚鍙�(鍦ㄤ换鍔′腑鏄柊寤猴紝鍦ㄦ湇鍔′腑鏄棰嗗彇) 2 寰呭彂閫� 3 宸插彂閫� 4 涓嶆墽琛� 5 鍙戦�佸け璐� 6 宸插畬鎴� 7 瓒呮椂(浜哄伐)")
private Long sendstate;
/**
@@ -526,7 +526,7 @@
/**
- * 闀挎湡浠诲姟锛岀粰鎮ｈ�呭彂閫佺殑鏃堕棿
+ * 闀挎湡浠诲姟锛岀粰鎮ｈ�呭彂閫佺殑鏃堕棿 寮冪敤
*/
@Excel(name = " 闀挎湡浠诲姟锛岀粰鎮ｈ�呭彂閫佺殑鏃堕棿")
@ApiModelProperty(value = "闀挎湡浠诲姟锛岀粰鎮ｈ�呭彂閫佺殑鏃堕棿")
@@ -652,4 +652,21 @@
@ApiModelProperty(value = "寮傚父棰勮锛�0缁胯壊锛�1绾㈣壊锛�2榛勮壊; 3宸插鐞�")
private Integer isabnormal;
+
+ @ApiModelProperty(value = "缁х画鏍囪瘑")
+ private Integer continueFlag;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "缁х画鏃堕棿鐜板湪")
+ private Date continueTimeNow;
+
+ @ApiModelProperty(value = "缁х画鍐呭")
+ private String continueContent;
+
+ @ApiModelProperty(value = "缁х画娆℃暟")
+ private Integer continueCount;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "缁х画鏃堕棿涓嬫")
+ private Date continueTimeNext;
}
--
Gitblit v1.9.3