From d1082094bd984eed9559589196a8bfab19924555 Mon Sep 17 00:00:00 2001
From: Andru <769883346@qq.com>
Date: 星期五, 05 一月 2024 14:51:30 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/report/ShopReportDto.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 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 c05f351..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,7 +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