From 1b5fc79dd03377f95459878417514c1429336641 Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期五, 19 四月 2024 18:33:44 +0800
Subject: [PATCH] Merge branch 'fhx-prod-智能导诊' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/report/ShopReportDto.java |   10 ++++++++++
 1 files changed, 10 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..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,4 +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