Merge remote-tracking branch 'origin/master' into hckx

maven

2 天以前 3fd5bd656683c482141b13cfdb953d17ba377f1f

 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);
}