From e3fe83d7676c8f954564a7fb90e82295b3da2fee Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期二, 26 九月 2023 16:31:16 +0800
Subject: [PATCH] Merge branch 'master' 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