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/VO/ServiceSubtaskVO.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/domain/VO/ServiceSubtaskVO.java b/smartor/src/main/java/com/smartor/domain/VO/ServiceSubtaskVO.java
index bbe67dc..ff75efc 100644
--- a/smartor/src/main/java/com/smartor/domain/VO/ServiceSubtaskVO.java
+++ b/smartor/src/main/java/com/smartor/domain/VO/ServiceSubtaskVO.java
@@ -266,7 +266,7 @@
* 鍙戦�佺姸鎬�
*/
@Excel(name = " 鍙戦�佺姸鎬� ")
- @ApiModelProperty(value = "鍙戦�佺姸鎬� 1 琚鍙�(鍦ㄤ换鍔′腑鏄柊寤猴紝鍦ㄦ湇鍔′腑鏄棰嗗彇) 2 寰呭彂閫� 3 宸插彂閫� 4 涓嶆墽琛� 5 鍙戦�佸け璐� 6 宸插畬鎴�")
+ @ApiModelProperty(value = "鍙戦�佺姸鎬� 1 琚鍙�(鍦ㄤ换鍔′腑鏄柊寤猴紝鍦ㄦ湇鍔′腑鏄棰嗗彇) 2 寰呭彂閫� 3 宸插彂閫� 4 涓嶆墽琛� 5 鍙戦�佸け璐� 6 宸插畬鎴� 7 瓒呮椂(浜哄伐)")
private Long sendstate;
/**
@@ -747,10 +747,11 @@
@ApiModelProperty(value = "鍒嗙粍key")
private String groupKey;
- @ApiModelProperty(value = "缁х画鏍囪瘑")
+ @ApiModelProperty(value = "缁х画鏍囪瘑:1 娌� 2鏈�")
private Integer continueFlag;
@ApiModelProperty(value = "缁х画鏃堕棿鐜板湪")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date continueTimeNow;
@ApiModelProperty(value = "缁х画鍐呭")
@@ -760,6 +761,7 @@
private Integer continueCount;
@ApiModelProperty(value = "缁х画鏃堕棿涓嬫")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date continueTimeNext;
/**
--
Gitblit v1.9.3