From 195af7b92b0aa5534cb28d25aa589f2d2545c7e9 Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期一, 25 九月 2023 17:17:38 +0800
Subject: [PATCH] Merge branch 'master' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/report/ShopReportDto.java | 7 +++++++
1 files changed, 7 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..c05f351 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,17 @@
private String shopId;
/**褰撳墠鏃堕棿*/
private String nowTime;
+ /**鏄惁鏃堕棿娈电瓫閫�*/
+ private Integer isSelectPeriod = 0;
/**寮�濮嬫椂闂�*/
private String startTime;
/**缁撴潫鏃堕棿*/
private String endTime;
+ /**娌夌潯鏃堕棿*/
+ private String sleepTime;
/**闂ㄥ簵鍒楄〃鏍囪瘑*/
private List<String> shopIdList;
+
+ /** 鏄惁杩囨护娴嬭瘯鐢ㄦ埛璐﹀彿 */
+ private Integer isFilterTestAccount;
}
--
Gitblit v1.8.0