From 56f732ed7af0e82f32f809ff0797fd0b83b62306 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 05 十二月 2024 14:53:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsCategoryController.java |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)

diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsCategoryController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsCategoryController.java
index a63bd12..b6c5b53 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsCategoryController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsCategoryController.java
@@ -5,16 +5,10 @@
 import com.ruoyi.other.api.domain.GoodsCategory;
 import com.ruoyi.other.service.GoodsCategoryService;
 import io.swagger.annotations.ApiOperation;
-import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.other.api.domain.GoodsCategory;
-import com.ruoyi.other.service.GoodsCategoryService;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.util.List;

--
Gitblit v1.7.1