From 34c5df174a03341fa469a5196410205cebc26b82 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 29 Feb 2024 10:03:34 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb

---
 screen-api/src/main/java/com/moral/api/dto/OnlineRatePageCond.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/screen-api/src/main/java/com/moral/api/dto/OnlineRatePageCond.java b/screen-api/src/main/java/com/moral/api/dto/OnlineRatePageCond.java
index c3666fd..84bee9b 100644
--- a/screen-api/src/main/java/com/moral/api/dto/OnlineRatePageCond.java
+++ b/screen-api/src/main/java/com/moral/api/dto/OnlineRatePageCond.java
@@ -38,6 +38,8 @@
     private  String endTime;
     @ApiModelProperty(value = "������")
     private Integer state;
+    @ApiModelProperty(value = "������������")
+    private  String hourState;
 
 
 }

--
Gitblit v1.8.0