From a1acacfb8cfa4b0e2fc07fbf214f4f9b47636c98 Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期五, 15 三月 2024 18:44:10 +0800
Subject: [PATCH] Merge branch 'fhx-prod-FDD' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/report/ShopReportDto.java | 9 ++++++++-
1 files changed, 8 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..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
@@ -24,7 +24,14 @@
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