Merge remote-tracking branch 'origin/master'

CBin

2023-08-02 88b0f7ea048e9b201af0bc390f3da8840b11c899

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

@@ -269,7 +269,7 @@
            }
            // 判断视频是否为空，并处理
            if (StringUtils.isNotBlank(video)) {
                strArr = picture.split(",");
                strArr = video.split(",");
                for (String str : strArr) {
                    taskFile = new TaskFile();
                    taskFile.setDelFlag(0);
@@ -282,7 +282,7 @@
            }
            // 判断音频是否为空，并处理
            if (StringUtils.isNotBlank(audio)) {
                strArr = picture.split(",");
                strArr = audio.split(",");
                for (String str : strArr) {
                    taskFile = new TaskFile();
                    taskFile.setDelFlag(0);