From 6a3f8907a2f9d240f8a07e7283682286d2b52c75 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 08 七月 2024 16:40:31 +0800
Subject: [PATCH] Merge branch 'master-prod-new' 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