From 67a5f2c9689d38b5b1533888829b7f9bbf0c3ba8 Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Thu, 18 Apr 2024 14:01:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into dev
---
screen-api/src/main/java/com/moral/api/vo/OnlineRateVo.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/vo/OnlineRateVo.java b/screen-api/src/main/java/com/moral/api/vo/OnlineRateVo.java
index 71bf08d..679e941 100644
--- a/screen-api/src/main/java/com/moral/api/vo/OnlineRateVo.java
+++ b/screen-api/src/main/java/com/moral/api/vo/OnlineRateVo.java
@@ -41,9 +41,13 @@
@ApiModelProperty(value = "������")
private String state;
+ private String hourState;
+
private String mac;
-
+ public String getHourState(){
+ return Objects.isNull(this.hourState)?"0":this.hourState;
+ }
public String getEndTime(){
return Objects.isNull(this.endTime)?"-":this.endTime;
@@ -57,7 +61,7 @@
}
public String getOnlineRate(){
- return Objects.isNull(this.onlineRate)?"0%":this.onlineRate;
+ return Objects.isNull(this.onlineRate)?"0":this.onlineRate;
}
public Integer getOnlineTime(){
--
Gitblit v1.8.0