From 155905061b3aa29d2aa23e5693e8704debfb9828 Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期一, 06 十一月 2023 16:36:06 +0800
Subject: [PATCH] Merge branch 'master' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/report/OperationalStatementsVo.java |    2 ++
 1 files changed, 2 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){

--
Gitblit v1.8.0