From e544a0e16e07431c9a5659d30ef22d121fc3cb2a Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期三, 21 六月 2023 12:31:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/report/PerformanceReqParamsDto.java |    5 ++++-
 1 files changed, 4 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..c0cd102 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

--
Gitblit v1.8.0