From 9574cd990b7e32f966edc45824f8f952b5215d58 Mon Sep 17 00:00:00 2001
From: ANDRU-PC\Andru <769883346@qq.com>
Date: 星期二, 18 七月 2023 19:58:49 +0800
Subject: [PATCH] Merge branch 'master' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/report/ShopReportDto.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/ShopReportDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/ShopReportDto.java
index 39bea7a..ab01413 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/report/ShopReportDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/report/ShopReportDto.java
@@ -14,10 +14,14 @@
private String shopId;
/**褰撳墠鏃堕棿*/
private String nowTime;
+ /**鏄惁鏃堕棿娈电瓫閫�*/
+ private Integer isSelectPeriod = 0;
/**寮�濮嬫椂闂�*/
private String startTime;
/**缁撴潫鏃堕棿*/
private String endTime;
+ /**娌夌潯鏃堕棿*/
+ private String sleepTime;
/**闂ㄥ簵鍒楄〃鏍囪瘑*/
private List<String> shopIdList;
}
--
Gitblit v1.8.0