Merge remote-tracking branch 'origin/master'

luodangjia

2024-12-05 1e4882c018f13c2b686f2544316672ee66eeced6

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

@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.core.web.page.TableDataInfo;
import com.ruoyi.other.api.domain.Goods;
import com.ruoyi.other.service.GoodsService;
import com.ruoyi.other.vo.GoodsVO;
@@ -35,9 +36,9 @@
     */
    @GetMapping("/goodsList")
    @ApiOperation(value = "商品列表", tags = {"小程序-商城-首页-热门商品列表", "首页热门商品-小程序"})
    public R<List<GoodsVO>> goodsList(Goods goods){
    public R<TableDataInfo> goodsList(Goods goods){
        startPage();
        return R.ok(goodsService.goodsList(goods));
        return R.ok(getDataTable(goodsService.goodsList(goods)));
    }