From 1a4b636cae41fdd15199beb1ea5df45b31de5b7d Mon Sep 17 00:00:00 2001
From: cmg <527198563@qq.com>
Date: 星期三, 19 六月 2024 14:27:24 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-stander
---
phis-feign/src/main/java/com/hz/his/dto/report/ShopReportDto.java | 14 ++++++++++++++
1 files changed, 14 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..2ae9bf2 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,24 @@
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;
+ /**鏄惁缁熻鐜伴噾涓氱哗*/
+ private Integer isCountCash = 0;
+ /**鍛樺伐鏍囪瘑鍒楄〃*/
+ private List<String> employeeIdList;
+ /**缁熻绫诲瀷*/
+ private String countType;
+ /**鏄惁缁熻椤鹃棶鏁版嵁*/
+ private Integer isCountAdviser = 0;
}
--
Gitblit v1.8.0