From 579ed0815abc4d30aaf433f6292396c0d87093d8 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 15 八月 2024 17:25:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/VideoOnlineResult.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/VideoOnlineResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/VideoOnlineResult.java
index 620c8ba..7516d2f 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/VideoOnlineResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/VideoOnlineResult.java
@@ -1,5 +1,6 @@
package com.ycl.platform.domain.result.UY;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ycl.platform.domain.result.BaseResult;
import lombok.Data;
import org.springframework.data.mongodb.core.index.TextIndexed;
@@ -40,7 +41,7 @@
/**
* 璁惧id
*/
- private Integer deviceId;
+ private String deviceId;
/**
* 璁惧鍚嶇О
*/
@@ -56,6 +57,7 @@
/**
* 鏈�杩慽cmp鏃堕棿
*/
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date icmpTime;
/**
* 鍏抽敭甯ф椂寤�
@@ -72,6 +74,7 @@
/**
*
*/
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date olErrEverduringFirstTime;
/**
* 绱绂荤嚎鏁呴殰娆℃暟
@@ -108,7 +111,7 @@
/**
* 绉熸埛id
*/
- private Integer tenantId;
+ private String tenantId;
/**
* 瑙嗛娴佹椂寤�
*/
@@ -116,6 +119,7 @@
/**
*
*/
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date vqdTime;
}
--
Gitblit v1.8.0