From 32e2c1f5097f36fe37ea2969f6337d24f55576f4 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期六, 24 六月 2023 18:24:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new

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

diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiOpeStaService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiOpeStaService.java
index 74c0c8b..d42e81e 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiOpeStaService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiOpeStaService.java
@@ -137,5 +137,17 @@
     @PostMapping("/admin/operational/rfm/data/list")
     Result rfmDataList(@RequestBody OperationalStatementsVo operationalStatementsVo);
 
+    /**
+     * 鍚勯棬搴楃幇閲戜笟缁╁畬鎴愭儏鍐�
+     */
+    @PostMapping("/admin/operational/shop/cash/complete/list")
+    Result shopCashCompleteList(@RequestBody OperationalStatementsVo operationalStatementsVo);
+
+    /**
+     * 鏈勾搴﹀悇鏈堢幇閲�&鎵ц涓氱哗瀹屾垚鎯呭喌
+     */
+    @PostMapping("/admin/operational/month/deduction/list")
+    Result monthDeductionList(@RequestBody OperationalStatementsVo operationalStatementsVo);
+
 
 }

--
Gitblit v1.8.0