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

nidapeng

2024-03-29 6f2496537d0e376abc9892e1d8e0076ff08866b2

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

@@ -86,8 +86,11 @@
     * @param pageWrap 分页对象
     * @return PageData<ApplyChagneDetail>
     */
    PageData<ApplyChagneDetail> findPage(PageWrap<ApplyDetailPageDTO> pageWrap);
    PageData<ApplyChagneDetail> findPage(PageWrap<ApplyChagneDetail> pageWrap);

    PageData<ApplyChagneDetail> findPageForCompany(PageWrap<ApplyDetailPageDTO> pageWrap);

    List<ApplyChagneDetail> findListForCompany(ApplyDetailPageDTO applyDetailPageDTO);
    /**
     * 条件统计
     *