From 37993b3cf3243e6ffdacab526b04dd2284565a42 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期四, 25 七月 2024 18:59:31 +0800
Subject: [PATCH] Merge branch 'master-base' into master-prod-new

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

diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiRevenueRecognitionService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiRevenueRecognitionService.java
index 17ffb8e..7b124a0 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiRevenueRecognitionService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiRevenueRecognitionService.java
@@ -21,9 +21,17 @@
     Result list(@RequestBody RevenueQuery revenueQuery);
 
     /**
+     * 鑾峰彇涓婃捣鍗洃璐圭敤鍒楄〃
+     * @param revenueQuery
+     * @return
+     */
+    @PostMapping("/revenue/recogntion/shanghai/hs/fee/list")
+    Result shanghaiHsFeeList(@RequestBody RevenueQuery revenueQuery);
+
+    /**
      * 瀵煎嚭excel
      */
-    @PostMapping("/export/excel")
+    @PostMapping("/revenue/recogntion/export/excel")
     Result exportExcel(@RequestBody RevenueQuery revenueQuery);
 
 

--
Gitblit v1.8.0