From fcb98e4558897945a316d04555923355b8e60605 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期二, 21 七月 2026 10:16:56 +0800
Subject: [PATCH] Merge branch 'master' into master-任务组
---
smartor/src/main/java/com/smartor/domain/ServiceTaskVO.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceTaskVO.java b/smartor/src/main/java/com/smartor/domain/ServiceTaskVO.java
index 771d890..ec6e65c 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceTaskVO.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceTaskVO.java
@@ -29,9 +29,9 @@
private String taskDesc;
/**
- * pageSize
+ * 鏄惁鏄暱鏈熶换鍔� 0锛氫复鏃朵换鍔� 1锛氶暱鏈熶换鍔� 2鍥哄畾浠诲姟 3寰幆浠诲姟
*/
- @ApiModelProperty("鏄惁鏄暱鏈熶换鍔� 0锛氫笉鏄� 1锛氭槸")
+ @ApiModelProperty("鏄惁鏄暱鏈熶换鍔� 0锛氫复鏃朵换鍔� 1锛氶暱鏈熶换鍔� 2鍥哄畾浠诲姟 3寰幆浠诲姟")
private Integer longTask = 0;
/**
@@ -433,12 +433,11 @@
@ApiModelProperty("鎵嬫湳绛夌骇缂栫爜")
@Excel(name = "鎵嬫湳绛夌骇缂栫爜")
private String oplevelcode;
-
/**
- * 閫傜敤鏉′欢绫诲瀷锛�1銆佹寜绉戝銆�2銆佹寜鐥呭尯銆�3銆佹寜鐤剧梾璇婃柇銆�4銆佹寜鎵嬫湳绫诲瀷
+ * 閫傜敤鏉′欢绫诲瀷锛�1銆佹寜绉戝銆�2銆佹寜鐥呭尯銆�3銆佹寜鐤剧梾璇婃柇銆�4銆佹寜鎵嬫湳绫诲瀷銆�5銆佹寜浠诲姟缁�
*/
- @ApiModelProperty("閫傜敤鏉′欢绫诲瀷锛�1銆佹寜绉戝銆�2銆佹寜鐥呭尯銆�3銆佹寜鐤剧梾璇婃柇銆�4銆佹寜鎵嬫湳绫诲瀷")
- @Excel(name = "閫傜敤鏉′欢绫诲瀷锛�1銆佹寜绉戝銆�2銆佹寜鐥呭尯銆�3銆佹寜鐤剧梾璇婃柇銆�4銆佹寜鎵嬫湳绫诲瀷")
+ @ApiModelProperty("閫傜敤鏉′欢绫诲瀷锛�1銆佹寜绉戝銆�2銆佹寜鐥呭尯銆�3銆佹寜鐤剧梾璇婃柇銆�4銆佹寜鎵嬫湳绫诲瀷銆�5銆佹寜浠诲姟缁�")
+ @Excel(name = "閫傜敤鏉′欢绫诲瀷锛�1銆佹寜绉戝銆�2銆佹寜鐥呭尯銆�3銆佹寜鐤剧梾璇婃柇銆�4銆佹寜鎵嬫湳绫诲瀷銆�5銆佹寜浠诲姟缁�")
private String appltype;
@ApiModelProperty(value = "闅忚閮ㄩ棬缂栫爜")
@@ -453,4 +452,10 @@
@ApiModelProperty(value = "鐤剧梾鐥呯")
@Excel(name = " 鐤剧梾鐥呯")
private String diagType;
+
+ /**
+ * 浠诲姟缁勮鍒掞紙appltype=5 蹇呭～锛屼富璁″垝 + 鏄庣粏鍒楄〃锛�
+ */
+ @ApiModelProperty(value = "浠诲姟缁勮鍒掞紙appltype=5 蹇呭～锛屼富璁″垝+鏄庣粏锛�")
+ private ServiceTaskScheduleVO serviceTaskScheduleVO;
}
--
Gitblit v1.9.3