Merge remote-tracking branch 'origin/master'

jiangping

2023-12-14 9fc3cec0d40c86b8b4a8e34dcf7a82645ccbd192

 server/dmvisit_service/src/main/java/com/doumee/service/business/CompanyService.java

@@ -103,7 +103,6 @@
     * @return PageData<Company>
     */
    PageData<Company> findPage(PageWrap<Company> pageWrap);

    /**
     * 条件统计
     *
@@ -118,4 +117,5 @@
     * @return
     */
    List<CompanyDTO> findCompanyTreePage(Integer type);

}