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

jiaosong

2023-10-17 7ec37d4b36111c0192f2c7674b07f8dd1daf1d53

 server/services/src/main/java/com/doumee/service/business/SitesService.java

@@ -115,9 +115,8 @@
     * @param pageWrap 分页对象
     * @return PageData<Sites>
     */
    PageData<SitesMonitorDTO> findSitesMonitorDTOPage(PageWrap<SitesMonitorDTO> pageWrap);
    PageData<Sites> findSitesMonitorDTOPage(PageWrap<SitesMonitorDTO> pageWrap);


    PageData<SitesMonitorBikeDTO> getSitesMonitorBikeDTO(PageWrap<SitesMonitorDTO> pageWrap);

}