Merge remote-tracking branch 'origin/dev' into dev

jiangping

2025-02-08 75ac3d5acdd448f063a3c307b4c733e37b4fc04f

 server/company/src/main/java/com/doumee/api/business/BaseGoodsController.java

@@ -37,7 +37,7 @@
    @PostMapping("/page")
//    @RequiresPermissions("business:basegoods:query")
    public ApiResponse<PageData<BaseGoods>> findPage (@RequestBody PageWrap<BaseGoods> pageWrap) {
        return ApiResponse.success(baseGoodsService.findPage(pageWrap));
        return ApiResponse.success(baseGoodsService.findCompanyPage(pageWrap));
    }

}