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/ShopCashReportDto.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/ShopCashReportDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/ShopCashReportDto.java
index 9bf67f6..8560f79 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/report/ShopCashReportDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/report/ShopCashReportDto.java
@@ -19,6 +19,8 @@
     private String endTime;
     /**闂ㄥ簵鍒楄〃鏍囪瘑*/
     private List<String> shopIdList;
+    /** 鏄惁杩囨护娴嬭瘯鐢ㄦ埛璐﹀彿 */
+    private Integer isFilterTestAccount;
 
     /**涓氱哗绫诲瀷-闂ㄥ簵鏃ョ幇閲戜笟缁�*/
     public static final String  TYPE_DAY_CASH= "day_cash";

--
Gitblit v1.8.0