From e0a35f3912912fb3a160ee2633594a2e6c828abc Mon Sep 17 00:00:00 2001
From: rx <auster_i@163.com>
Date: 星期四, 26 十月 2023 12:10:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/rx-1023-营销优惠券新版' 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