From dbf3d2ed84142a6dc4092353b59be902a153bcb6 Mon Sep 17 00:00:00 2001
From: rx <auster_i@163.com>
Date: 星期四, 10 八月 2023 15:36:34 +0800
Subject: [PATCH] Merge branch 'rx-0807-优惠券查询补充条件' into master-prod-new

---
 phis-feign/src/main/java/com/hz/his/feign/service/phisAdmin/SLabelInfoService.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phisAdmin/SLabelInfoService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phisAdmin/SLabelInfoService.java
index dde19ce..9798b47 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phisAdmin/SLabelInfoService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phisAdmin/SLabelInfoService.java
@@ -14,5 +14,5 @@
      * 鏍囩鍒嗙被鏍戝瀷鍒楄〃(鎼滅储)
      */
     @RequestMapping("/foreign/api/user/label/type/tree/list")
-    Result listTreeData();
+    Result userLabelTypeTreeList();
 }
\ No newline at end of file

--
Gitblit v1.8.0