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

jiangping

2025-02-08 75ac3d5acdd448f063a3c307b4c733e37b4fc04f

 server/service/src/main/java/com/doumee/service/business/BaseGoodsService.java

@@ -133,7 +133,7 @@
     * @param pageWrap 分页对象
     * @return PageData<BaseGoods>
     */
    PageData<BaseGoods> findCompanyPage(PageWrap<BaseGoods> pageWrap,Integer companyId);
    PageData<BaseGoods> findCompanyPage(PageWrap<BaseGoods> pageWrap);

    /**
     * 条件统计