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

cloudroam

2024-12-29 a02bed07c8281ae0fda850921eb7443393c5fb0c

 src/main/java/com/mzl/flower/service/impl/sms/SmsTaskServiceImpl.java

@@ -282,7 +282,7 @@
            smsTaskDTO.setNum((long) lineList.size());
        }

        if(!smsTaskDTO.getFileUrl().equals(smsTaskDO.getFileUrl())){
        if(Constants.SMS_RECEIVE_TYPE.IMPORT.name().equals(smsTaskDTO.getType()) && !smsTaskDTO.getFileUrl().equals(smsTaskDO.getFileUrl())){
            dealImportExcel(smsTaskDTO);
        }
        List<SmsUserDTO> smsUserDTOS = smsTaskDTO.getSmsUserDTOS();