Merge remote-tracking branch 'origin/cjl' into dev

cjl

2024-04-18 67a5f2c9689d38b5b1533888829b7f9bbf0c3ba8

 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(){