From 0155e75a9b1189a7ba805faad55a359b2b8cd259 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 24 Jun 2021 10:37:59 +0800
Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop
---
gc-shop/src/main/java/com/xzx/gc/shop/controller/AdminGoodsCategoryController.java | 16 +++++++---------
1 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/controller/GoodsController.java b/gc-shop/src/main/java/com/xzx/gc/shop/controller/AdminGoodsCategoryController.java
similarity index 94%
rename from gc-shop/src/main/java/com/xzx/gc/shop/controller/GoodsController.java
rename to gc-shop/src/main/java/com/xzx/gc/shop/controller/AdminGoodsCategoryController.java
index 3ae1d0e..2b589bf 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/controller/GoodsController.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/controller/AdminGoodsCategoryController.java
@@ -10,14 +10,10 @@
import com.xzx.gc.entity.ScoreGoodsCategory;
import com.xzx.gc.model.JsonResult;
import com.xzx.gc.model.admin.GoodsCategoryModel;
-import com.xzx.gc.shop.dto.AddGoodsCategoryDto;
-import com.xzx.gc.shop.dto.DeleteGoodsCategoryDto;
-import com.xzx.gc.shop.dto.QueryGoodsCategoryListDto;
-import com.xzx.gc.shop.dto.UpdateGoodsCategoryDto;
+import com.xzx.gc.shop.dto.*;
import com.xzx.gc.shop.mapper.ScoreGoodsCategoryMapper;
import com.xzx.gc.shop.service.GoodsService;
-import com.xzx.gc.shop.vo.QueryGoodsCategoryListVo;
-import com.xzx.gc.shop.vo.ViewGoodsCategoryVo;
+import com.xzx.gc.shop.vo.*;
import io.swagger.annotations.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
@@ -29,9 +25,9 @@
import java.util.Map;
@RestController
-@Api(tags = {"积分商城--商品管理"})
+@Api(tags = {"积分商城--商品分类管理"})
@Slf4j
-public class GoodsController extends BaseController {
+public class AdminGoodsCategoryController extends BaseController {
@Resource
private GoodsService goodsService;
@@ -104,7 +100,7 @@
}
goodsService.deleteGoodsCategory(id);
OperationAppLog build = OperationAppLog.builder().appPrograme(CommonEnum.后台.getValue()).opreateName(getAdminName(request))
- .methodName(Constants.SCORESHOP_MODUL_NAME).operateAction("商品管理-删除添加商品分类-"+id).build();
+ .methodName(Constants.SCORESHOP_MODUL_NAME).operateAction("商品管理-删除商品分类-"+id).build();
mqUtil.sendApp(build);
return new JsonResult().success("操作成功！");
}
@@ -172,4 +168,6 @@
}
+
+
}
--
Gitblit v1.9.1