Merge remote-tracking branch 'origin/master'

puzhibing

2024-12-06 8ca8432f7dfb2c58ff6c0f9d1f7224b262bdaba4

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsCategoryController.java

@@ -5,9 +5,10 @@
import com.ruoyi.other.api.domain.GoodsCategory;
import com.ruoyi.other.service.GoodsCategoryService;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.Api;
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;
@@ -22,19 +23,26 @@
 */
@RestController
@RequestMapping("/goods-category")
@Api(tags = "商品分类")
public class GoodsCategoryController {
    @Resource
    private GoodsCategoryService goodsCategoryService;

    @PostMapping("/index/list")
    @GetMapping("/index/list")
   @ApiOperation(value = "商品分类", tags = {"小程序-首页"})
   public R<List<GoodsCategory>> list(){
        List<GoodsCategory> list = goodsCategoryService.lambdaQuery()
   public R<List<GoodsCategory>> indexlist(){
        List<GoodsCategory> indexlist = goodsCategoryService.lambdaQuery()
                .orderByDesc(GoodsCategory::getCreateTime)
                .last("limit 8")
                .list()
                ;
        return R.ok(list);
        return R.ok(indexlist);
    }
    @GetMapping("/list")
    @ApiOperation(value = "商品分类列表", tags = {"小程序-商城-商城-首页-筛选"})
    public R<List<GoodsCategory>> list(){
        return R.ok(goodsCategoryService.list());
    }

}