From 03b606bcd56a04c6ea92b8af515a9fef97b84a7a Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期二, 10 十月 2023 16:54:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-test' into master-test

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

diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserCardService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserCardService.java
index ba67f69..3e6fbac 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserCardService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserCardService.java
@@ -25,6 +25,18 @@
     @PostMapping(value = "/user/card/delay/cardBag")
     Result delayCardBag(@RequestBody CardBagDto cardBagDto);
 
+    /**
+     * 寮�鏀惧钩鍙�-鍗″寘鍙姷鎵d俊鎭紙鍗曟潯锛�
+     * @return 杞寲瀵硅薄UserCardVo
+     */
+    @PostMapping(value = "/user/card/get/deduction-data")
+    Result deductionData(@RequestBody CardBagDto cardBagDto);
 
+    /**
+     * 寮�鏀惧钩鍙�-鍗″寘鍙姷鎵d俊鎭紙闆嗗悎锛�
+     * @return 杞寲瀵硅薄userCardMapVo
+     */
+    @PostMapping(value = "/user/card/get/deduction-data/list")
+    Result deductionDataList(@RequestBody CardBagDto cardBagDto);
 
 }
\ No newline at end of file

--
Gitblit v1.8.0