From 5e625dec445f8bfa05470d2b0faf29a35a9a6067 Mon Sep 17 00:00:00 2001
From: ANDRU-PC\Andru <769883346@qq.com>
Date: 星期二, 26 九月 2023 10:47:28 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiActivityReportService.java | 4 ++--
phis-feign/src/main/java/com/hz/his/dto/report/EmployeeReportDto.java | 2 ++
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/EmployeeReportDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/EmployeeReportDto.java
index 500b7d8..a7127cf 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/report/EmployeeReportDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/report/EmployeeReportDto.java
@@ -39,4 +39,6 @@
/**鎿嶄綔浜�*/
private String operatorId;
private String operatorName;
+ /**鏄惁杩囨护娴嬭瘯璐﹀彿鏁版嵁:0涓嶈繃婊�,1杩囨护*/
+ private Integer isFilterTestAccount;
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiActivityReportService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiActivityReportService.java
index 174ebf7..3ab1a6f 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiActivityReportService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiActivityReportService.java
@@ -15,8 +15,8 @@
public interface BiActivityReportService {
/**
- * 瀹汉鍒板簵鍑嗘椂鍒嗘瀽鎶ヨ〃
+ * 瀵煎嚭
*/
@PostMapping("/activity/report/export")
- Result storeAnalysis(@RequestBody ActivityReportDto activityReportDto);
+ Result export(@RequestBody ActivityReportDto activityReportDto);
}
--
Gitblit v1.8.0