Merge remote-tracking branch 'origin/master'

aijinhui

2023-10-30 305fe6a8621998e5130d541660c2e3c5f02672d6

 ard-work/src/main/java/com/ruoyi/alarmpoints/well/controller/ArdAlarmpointsWellController.java

@@ -152,9 +152,9 @@
    @ApiOperation("导入井")
    public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception {
        ExcelUtil<ArdAlarmpointsWell> util = new ExcelUtil<ArdAlarmpointsWell>(ArdAlarmpointsWell.class);
        List<ArdAlarmpointsWell> userList = util.importExcel(file.getInputStream());
        List<ArdAlarmpointsWell> wellList = util.importExcel(file.getInputStream());
        String operName = getUsername();
        String message = ardAlarmpointsWellService.importUser(userList, updateSupport, operName);
        String message = ardAlarmpointsWellService.importWell(wellList, updateSupport, operName);
        return success(message);
    }