Merge branch 'dev' into dev_dz

zhuo

2025-03-13 703d72927c617ffd5098c72cf6a465d180c5939f

 cnas-require/src/main/java/com/ruoyi/require/controller/FeLightningProtectionController.java

@@ -40,7 +40,7 @@
    public Result<?> addLightningProtectionDetection(FeLightningProtection feLightningProtection,
                                                     @RequestPart(value = "file", required = false) MultipartFile file) {
        if (ObjectUtils.isNotEmpty(file)) {
            String s = FileSaveUtil.StoreFile(file);
            String s = FileSaveUtil.uploadWordFile(file);
            feLightningProtection.setSystemFileName(s);
            feLightningProtection.setFileName(file.getOriginalFilename());
        }