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 | 8 +++++++-
1 files changed, 7 insertions(+), 1 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 3ad3d52..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
@@ -16,10 +16,14 @@
private String month;
/**鏈堜唤:yyyy-MM-dd*/
private String day;
-
+ /**鐢ㄦ埛澧為暱娓犻亾:1鏄�,0鍚�*/
+ private Integer selectUser;
/**闂ㄥ簵鏍囪瘑*/
private String shopId;
+ /**闂ㄥ簵鏍囪瘑闆嗗悎*/
private List<String> shopIdList;
+ /**娓犻亾澶х被娓犻亾鏍囪瘑闆嗗悎*/
+ private List<String> channelList;
/**寮�濮嬫椂闂�*/
private Date startTime;
/**缁撴潫鏃堕棿*/
@@ -30,6 +34,8 @@
private String loginCnName;
/**鐧诲綍鍛樺伐鍞竴瀛楃涓�*/
private String loginEmpStr;
+ /** 鏄惁杩囨护娴嬭瘯鐢ㄦ埛璐﹀彿 */
+ private Integer isFilterTestAccount;
public List<String> getShopIdList() {
if(shopIdList == null){
--
Gitblit v1.8.0