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

gongchunyi

昨天 0adbf58fd15052d8a044cf66eaa8afaa8591ba74

 src/main/java/com/ruoyi/sales/service/ICommonFileService.java

@@ -9,7 +9,7 @@

    int deleteSalesLedgerByIds(Long[] ids);

    CommonFile uploadFile(MultipartFile file, Long id, String type) throws IOException;
    CommonFile uploadFile(MultipartFile file, Long id, Integer type) throws IOException;

    int delCommonFileByIds(Long[] ids);
}