Merge remote-tracking branch 'origin/pim-jlmy' into pim-jlmy

yaowanxin

2 天以前 ca788dcbd73c5c8665b45da7ff4a0b1d92196b2c

 main-business/src/main/java/com/ruoyi/business/other/service/impl/TempFileServiceImpl.java

@@ -38,10 +38,10 @@
    @Autowired
    private CommonFileMapper commonFileMapper;

    @Value("${file.upload-dir}")
//    @Value("${file.upload-dir}")
    private String uploadDir;

    @Value("${file.temp-dir}")
//    @Value("${file.temp-dir}")
    private String tempDir;

    // 上传到临时目录