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'
---
dao/src/main/java/com/sandu/ximon/dao/domain/IpVolumeMission.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/dao/src/main/java/com/sandu/ximon/dao/domain/IpVolumeMission.java b/dao/src/main/java/com/sandu/ximon/dao/domain/IpVolumeMission.java
index 10f069d..ef03ec6 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/domain/IpVolumeMission.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/domain/IpVolumeMission.java
@@ -8,6 +8,7 @@
import java.io.Serializable;
import java.math.BigInteger;
import java.time.LocalDateTime;
+import java.util.ArrayList;
import java.util.List;
import com.fasterxml.jackson.annotation.JsonIgnore;
@@ -50,6 +51,7 @@
/**
* 鏂囦欢url
*/
+ @JsonIgnore
private String missionFileUrl;
/**
@@ -86,8 +88,17 @@
*/
private Integer missionVolume;
- /*@TableField
- private List<IpVolumeFile> files;*/
+// @TableField(exist = false)
+// private List<IpVolumeFile> files=new ArrayList<>();
+//
+// @TableField(exist = false)
+// private List<BroadcastTerminalV2Entity> BroadcastTerminal=new ArrayList<>();
+
+ @TableField(exist = false)
+ private List<Integer> fileIds=new ArrayList<>();
+
+ @TableField(exist = false)
+ private List<Integer> TerminalIds=new ArrayList<>();
/*@TableField
private List<String> fileNames;*/
--
Gitblit v1.9.3