Merge remote-tracking branch 'origin/master'

xuhy

2025-01-15 d5bf846770b001cac64ca27a3fe2886a9c5076b3

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

@@ -64,6 +64,7 @@
    public R<Page<GoodsCategory>> list(@ApiParam("页码") @RequestParam Integer pageNum,@ApiParam("每一页数据大小") Integer pageSize, GoodsCategory goodsCategory){
        Page<GoodsCategory> page = goodsCategoryService.lambdaQuery()
                .like(StringUtils.isNotEmpty(goodsCategory.getName()),GoodsCategory::getName, goodsCategory.getName())
                .eq(GoodsCategory::getDelFlag,0)
                .page(Page.of(pageNum, pageSize));
        return R.ok(page);
    }