From c4db0244744710528fbea1c3ad5a60ed254b3929 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 12 十一月 2025 18:20:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/MerchantController.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/MerchantController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/MerchantController.java
index 150dd06..82c765b 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/MerchantController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/MerchantController.java
@@ -69,5 +69,12 @@
return R.ok(merchant);
}
+ @GetMapping("/getMerchantTypeList")
+ @ApiOperation(value = "惠民商务--商户分类列表",response = TMerchantType.class)
+ public R<List<TMerchantType>> getMerchantTypeList() {
+ List<TMerchantType> list = merchantTypeService.list();
+ return R.ok(list);
+ }
+
}
--
Gitblit v1.7.1