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

jiaosong

2023-09-21 0d17e59721df8386120156f045b1900a7e435097

 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);

    /**
     * 条件统计