From 20c86767e4adeea95a131c8f5f8f7d29a67f83f7 Mon Sep 17 00:00:00 2001
From: Andru <769883346@qq.com>
Date: 星期二, 26 十二月 2023 17:34:32 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test

---
 phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiUserService.java |   18 +++++++++++++++++-
 1 files changed, 17 insertions(+), 1 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiUserService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiUserService.java
index 6f18fed..0662cf8 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiUserService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiUserService.java
@@ -41,10 +41,22 @@
     Result deductionList(@RequestBody UserReportDto userReportDto);
 
     /**
+     * 椤圭洰娑堣垂棰戞鍜屾笚閫忕巼-瀵煎嚭娓楅�忔湭鎵ц
+     */
+    @PostMapping("/admin/user/report/deduction/list/export")
+    Result deductionListExport(@RequestBody UserReportDto userReportDto);
+
+    /**
      * 鍖荤敓鎷夌兢绾跨储-鍘嗗彶娌荤枟鏍囩
      */
     @PostMapping("/admin/user/report/treat/tag/list")
     Result treatTagList(@RequestBody UserReportDto userReportDto);
+
+    /**
+     * 鍖荤敓鎷夌兢绾跨储-鍘嗗彶娌荤枟鏍囩-瀵煎嚭
+     */
+    @PostMapping("/admin/user/report/treat/tag/list/export")
+    Result treatTagListExport(@RequestBody UserReportDto userReportDto);
 
     /**
      * 鍖荤敓鎷夌兢绾跨储-缇庨檯鏍囩
@@ -52,6 +64,10 @@
     @PostMapping("/admin/user/report/treat/mj/tag/list")
     Result treatMjTagList(@RequestBody UserReportDto userReportDto);
 
-
+    /**
+     * 鍖荤敓鎷夌兢绾跨储-缇庨檯鏍囩-瀵煎嚭
+     */
+    @PostMapping("/admin/user/report/treat/mj/tag/list/export")
+    Result treatMjTagListExport(@RequestBody UserReportDto userReportDto);
 
 }

--
Gitblit v1.8.0