Merge branch 'master' into pim_ywx

yaowanxin

2025-09-18 5adb3b16305a0d8dfdb8104a368d9dda6a4963f3

 src/main/java/com/ruoyi/basic/controller/CustomerController.java

@@ -61,7 +61,7 @@
    @PostMapping("/importData")
    public AjaxResult importData(MultipartFile file) throws Exception {

        return success(customerService.importData(file));
        return customerService.importData(file);
    }

    /**