From ef270bd1855b5ce3f398c5df024840a498e33a8f Mon Sep 17 00:00:00 2001
From: MercuryZ <zdmisif@126.com>
Date: 星期四, 31 三月 2022 14:09:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/vo/TaskVO.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/vo/TaskVO.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/vo/TaskVO.java
index 9e6b69c..370c1c9 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/vo/TaskVO.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/vo/TaskVO.java
@@ -1,11 +1,15 @@
package com.sandu.ximon.admin.vo;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonIgnore;
import com.sandu.ximon.admin.dto.BroadcastTaskType;
import com.sandu.ximon.admin.param.IPTaskParam;
import com.sandu.ximon.admin.param.IpVolumeMissionParam;
import lombok.Data;
import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.List;
@Data
public class TaskVO {
@@ -76,6 +80,7 @@
// 绯荤粺淇濈暀
private BigInteger btime;
// 浠诲姟鎵ц瑙勫垯锛堟瘡澶╀负 0锛屾瘡鍛ㄤ负 1锛屾墜鍔ㄤ负 2)
+ @JsonIgnore
private Integer rule;
// 浠诲姟寮�濮嬫棩鏈燂紝涓�鑸负浠诲姟鍒涘缓鏃ユ湡
private BigInteger bdate;
@@ -110,10 +115,18 @@
// 浠诲姟鎵ц鏃堕棿鍒楄〃
private TaskRunTimeVO[] exec;
// 闊抽鏂囦欢鍒楄〃
+ @JsonIgnore
private TaskMediaFileVO[] files;
// 鎾斁缁堢 ID 鍒楄〃
+ @JsonIgnore
private TaskTerminalVO[] terminals;
-
+ @JsonIgnore
private String userName;
+ private String weeks;
+
+ private List<Integer> fileIds=new ArrayList<>();
+
+ private List<Integer> TerminalIds=new ArrayList<>();
+
}
--
Gitblit v1.9.3