From c0a77acc892d89bf7dd4a04a19d85ba71c0dd57c Mon Sep 17 00:00:00 2001
From: rx <auster_i@163.com>
Date: 星期一, 26 八月 2024 16:12:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-rx-卡项促销活动分类' into master-jiayan-test

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

diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiGroupService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiGroupService.java
index 2803444..4166d3b 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiGroupService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiGroupService.java
@@ -1,24 +1,28 @@
 package com.hz.his.feign.service.platform.bi;
 
 import com.hx.resultTool.Result;
-import com.hz.his.dto.report.UserReportListDto;
+import com.hz.his.dto.report.GroupUserReportDto;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
 
 /**
- * 缇や笟缁�
+ * 缇ゆ暟鎹�
  * 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
  */
 @FeignClient(name = "phiskin-bi-view-user", path = "/bi-view", contextId = "bi-group-data")
 public interface BiGroupService {
 
     /**
-     * 鐢ㄦ埛鐜伴噾鎵ц鏁版嵁
+     * 缇ゆ暟鎹�-澧為暱涓績椤圭洰娑堣垂棰戞鍜屾秷璐�
      */
-    @PostMapping("/admin/user/report/money/data/list")
-    Result cashTotalList(@RequestBody UserReportListDto userReportListDto);
+    @PostMapping("/admin/group/report/deduction/total")
+    Result deductionTotal(@RequestBody GroupUserReportDto groupUserReportDto);
+
+
+
+
 
 
 }

--
Gitblit v1.8.0