From 112f94d84a0051d20761b42e0f5663f3f02c9a63 Mon Sep 17 00:00:00 2001
From: ANDRU-PC\Andru <769883346@qq.com>
Date: 星期三, 27 九月 2023 11:02:37 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/report/UserReleaseDto.java | 3 +++
phis-feign/src/main/java/com/hz/his/dto/report/OperationalStatementsVo.java | 2 ++
2 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/OperationalStatementsVo.java b/phis-feign/src/main/java/com/hz/his/dto/report/OperationalStatementsVo.java
index b651c5f..bf56620 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/report/OperationalStatementsVo.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/report/OperationalStatementsVo.java
@@ -34,6 +34,8 @@
private String loginCnName;
/**鐧诲綍鍛樺伐鍞竴瀛楃涓�*/
private String loginEmpStr;
+ /** 鏄惁杩囨护娴嬭瘯鐢ㄦ埛璐﹀彿 */
+ private Integer isFilterTestAccount;
public List<String> getShopIdList() {
if(shopIdList == null){
diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/UserReleaseDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/UserReleaseDto.java
index 8090bbb..b9e5a65 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/report/UserReleaseDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/report/UserReleaseDto.java
@@ -22,4 +22,7 @@
private List<String> employeeIdList;
/**绛夌骇鍒楄〃*/
private List<String> memberLevelList;
+ /** 鏄惁杩囨护娴嬭瘯鐢ㄦ埛璐﹀彿 */
+ private Integer isFilterTestAccount;
+
}
--
Gitblit v1.8.0