Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb

jinpengyong

2024-02-29 34c5df174a03341fa469a5196410205cebc26b82

 screen-api/src/main/java/com/moral/api/dto/OnlineRatePageCond.java

@@ -36,6 +36,10 @@

    @ApiModelProperty(value = "结束时间")
    private  String endTime;
    @ApiModelProperty(value = "状态")
    private Integer state;
    @ApiModelProperty(value = "小时状态")
    private  String hourState;


}