Merge remote-tracking branch 'origin/master' into pim_yys

maven

2025-08-06 a6f51ccae4bc650247d07838da97787d5302f1f8

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

    /**