From 195af7b92b0aa5534cb28d25aa589f2d2545c7e9 Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期一, 25 九月 2023 17:17:38 +0800
Subject: [PATCH] Merge branch 'master' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/report/OperationalStatementsVo.java |    6 +++++-
 1 files changed, 5 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..b651c5f 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;
     /**缁撴潫鏃堕棿*/

--
Gitblit v1.8.0