Merge remote-tracking branch 'origin/master'

fei

3 天以前 68af47f24bc344d2e1c5e1a848458b38679ddad4

 zhang-content/src/main/java/com/ruoyi/service/ZfCollectionDownloadService.java

@@ -8,7 +8,7 @@
public interface ZfCollectionDownloadService extends IService<ZfDownload> {
    AjaxResult addData(ZfDownload zfDownload);

    AjaxResult deleteData(Long[] ids);
    Boolean deleteData(Long[] ids);

    AjaxResult selectDoctorList(ZfDownload zfDownload, Integer pageNo , Integer pageSize);