From fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 29 七月 2024 18:51:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/inner/GoodsBrandController.java | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/inner/GoodsBrandController.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/inner/GoodsBrandController.java
index 5824c56..ffd7d26 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/inner/GoodsBrandController.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/inner/GoodsBrandController.java
@@ -1,9 +1,14 @@
package com.ruoyi.goods.controller.inner;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.security.annotation.InnerAuth;
+import com.ruoyi.system.api.domain.GoodsBrand;
+import com.ruoyi.goods.service.IGoodsBrandService;
import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
/**
* <p>
@@ -18,4 +23,15 @@
@RequiredArgsConstructor
public class GoodsBrandController {
+ @Resource
+ private IGoodsBrandService iGoodsBrandService;
+ @InnerAuth
+ @PostMapping("/getBrandOne")
+ @ResponseBody
+ public R<GoodsBrand> getBrandOne(@RequestBody Long brandId) {
+ GoodsBrand goodsBrandOne=iGoodsBrandService.getById(brandId);
+ return R.ok(goodsBrandOne);
+
+ }
+
}
--
Gitblit v1.7.1