Merge remote-tracking branch 'origin/2.0' into 2.0

Pu Zhibing

5 天以前 49c5117caef44d1e817d2ef701529dfaf1443467

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/MemberTaskServiceImpl.java

@@ -199,6 +199,7 @@
            if(taskFileList!=null&&!taskFileList.isEmpty()){
                taskFileService.saveBatch(taskFileList);
            }

        }
        // 判断下一个任务日期是否为空，并处理
        if (StringUtils.isNotBlank(merFollowMemberTaskDto.getNextTaskDate())) {