Merge remote-tracking branch 'origin/master'

jiangping

2024-01-31 31a2a1e82c6d1a80b62ef65bcfba46e084e372aa

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

@@ -47,6 +47,7 @@
     * @param solutions 实体对象
     */
    void updateById(Solutions solutions);
    void updateStatus(Solutions solutions);

    /**
     * 批量主键更新
@@ -86,7 +87,10 @@
     * @return PageData<Solutions>
     */
    PageData<Solutions> findPage(PageWrap<Solutions> pageWrap);
    PageData<Solutions> findPageCom(PageWrap<Solutions> pageWrap);


    List<Solutions> findListForCompany();
    /**
     * 条件统计
     *