Merge branch 'master' of http://118.89.139.230:10101/r/~whyclxw/CadDrawManager

lxw

2023-09-11 24cb4c00895e93e3f54c6cc268ea2c44e17d1026

 src/main/java/com/whyc/service/SoftwareService.java

@@ -272,11 +272,13 @@
            UpdateWrapper<Software> update = Wrappers.update();
            update.eq("file_name",softwareDB.getFileName());
            mapper.delete(update);
            String fontUpdateTime = softwareDB.getFontUpdateTime();
            softwareList.forEach(software2 -> {
                software2.setFileUrl(softwareDB.getFileUrl());
                software2.setExcelUrl(softwareHttpUrl + File.separator + originalFilename);
                software2.setCreateTime(new Date());
                software2.setLockFlag(-1);
                software2.setFontUpdateTime(fontUpdateTime);
            });
            mapper.insertBatchSomeColumn(softwareList);