From 10121f70218d5af50e68f343c18044073bd6d9ce Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期一, 03 七月 2023 17:12:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-test' into master-test

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

diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SConsumablesService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SConsumablesService.java
index d745c62..57fef07 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SConsumablesService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SConsumablesService.java
@@ -35,4 +35,11 @@
      */
     @PostMapping(value = "/consumables/update/list")
     Result getUpdateConsumables(@RequestBody ConsumablesDto consumablesDto);
+
+    /**
+     * 鑾峰彇浼樻儬鍒稿晢鍝佸垪琛�
+     * @return Result
+     */
+    @PostMapping(value = "/consumables/coupon/list")
+    Result getConsumablesCouponList(@RequestBody PageDto pageDto);
 }
\ No newline at end of file

--
Gitblit v1.8.0