From 9329e4df9d50bb47176de86d5b7a443cbd412641 Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期三, 15 十一月 2023 11:43:45 +0800
Subject: [PATCH] Merge branch 'master' into master-test

---
 phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserCardService.java |    8 +++++++-
 1 files changed, 7 insertions(+), 1 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 0fb33a9..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
@@ -26,11 +26,17 @@
     Result delayCardBag(@RequestBody CardBagDto cardBagDto);
 
     /**
-     * 寮�鏀惧钩鍙�-鍗″寘鍙姷鎵d俊鎭�
+     * 寮�鏀惧钩鍙�-鍗″寘鍙姷鎵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