From 1502135bdbf54143f2885c9f4c0c7db9bcb438f8 Mon Sep 17 00:00:00 2001
From: ANDRU-PC\Andru <769883346@qq.com>
Date: 星期三, 06 九月 2023 17:05:50 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/report/CashierSettlementDto.java | 2 ++
phis-feign/src/main/java/com/hz/his/dto/report/ClinicPerfReqDto.java | 2 ++
phis-feign/src/main/java/com/hz/his/vo/bi/revenue/RevenueQuery.java | 2 ++
3 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/CashierSettlementDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/CashierSettlementDto.java
index e324612..cf27166 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/report/CashierSettlementDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/report/CashierSettlementDto.java
@@ -34,6 +34,8 @@
private String userShopId;
/**閿�鍞钩鍙�*/
private String sourceName;
+ /**鏄惁杩囨护娴嬭瘯璐﹀彿*/
+ private Integer isFilterTestAccount;
/*******淇濆瓨鍙傛暟********/
/**鎿嶄綔浜烘爣璇�*/
diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/ClinicPerfReqDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/ClinicPerfReqDto.java
index bb999f1..0e6a3c8 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/report/ClinicPerfReqDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/report/ClinicPerfReqDto.java
@@ -29,4 +29,6 @@
private String operatorId;
/** 鎿嶄綔浜� */
private String operatorName;
+ /**鏄惁杩囨护娴嬭瘯璐﹀彿*/
+ private Integer isFilterTestAccount;
}
diff --git a/phis-feign/src/main/java/com/hz/his/vo/bi/revenue/RevenueQuery.java b/phis-feign/src/main/java/com/hz/his/vo/bi/revenue/RevenueQuery.java
index 9840bb7..800cd06 100644
--- a/phis-feign/src/main/java/com/hz/his/vo/bi/revenue/RevenueQuery.java
+++ b/phis-feign/src/main/java/com/hz/his/vo/bi/revenue/RevenueQuery.java
@@ -39,6 +39,8 @@
private Date startCreateTime;
/**鍒涘缓鏃ユ湡*/
private Date endCreateTime;
+ /**鏄惁杩囨护娴嬭瘯璐﹀彿*/
+ private Integer isFilterTestAccount;
/**璇锋眰鎿嶄綔浜�*/
private String operatorId;
--
Gitblit v1.8.0