From 10121f70218d5af50e68f343c18044073bd6d9ce Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期一, 03 七月 2023 17:12:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-test' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/report/PerformanceReqParamsDto.java |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/PerformanceReqParamsDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/PerformanceReqParamsDto.java
index b4851de..8a9270a 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/report/PerformanceReqParamsDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/report/PerformanceReqParamsDto.java
@@ -28,7 +28,10 @@
     private String deductStartTime;
     //鎵ц缁撴潫鏃堕棿
     private String deductEndTime;
-
+    //涓氱哗寮�濮嬫椂闂�
+    private String startTime;
+    //涓氱哗缁撴潫鏃堕棿
+    private String endTime;
     //鎵�灞為棬搴梚d
     private String belongShopId;
     //鏈嶅姟闂ㄥ簵id
@@ -84,4 +87,8 @@
     private Integer sumIsShop = NO;
     //姹囨�昏鑹�
     private String sumRole;
+
+    //鎿嶄綔浜�
+    private String operatorId;
+    private String operatorName;
 }

--
Gitblit v1.8.0