From 01f6c4723da041da273b69dee0632091b634cff3 Mon Sep 17 00:00:00 2001
From: Andru <769883346@qq.com>
Date: 星期四, 18 一月 2024 10:03:12 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/report/ShopReportDto.java | 8 ++++++++
1 files changed, 8 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 ab01413..f7e5f5d 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
@@ -24,4 +24,12 @@
private String sleepTime;
/**闂ㄥ簵鍒楄〃鏍囪瘑*/
private List<String> shopIdList;
+ /** 鏄惁杩囨护娴嬭瘯鐢ㄦ埛璐﹀彿 */
+ private Integer isFilterTestAccount;
+ /**鏄惁缁熻鐜伴噾涓氱哗*/
+ private Integer isCountCash = 0;
+ /**鍛樺伐鏍囪瘑鍒楄〃*/
+ private List<String> employeeIdList;
+ /**缁熻绫诲瀷*/
+ private String countType;
}
--
Gitblit v1.8.0