Merge remote-tracking branch 'origin/master'

liyong

21 小时以前 f02b5af51f2fcfaae5b04e4c12078ec0da578f7e

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