update: merge

src/views/ai/task/components/defineTime.vue

@@ -132,20 +132,11 @@ export default {
         let start = new Date(new Date().toLocaleDateString() + ' ' + item.startTime).getTime();
         minutes = (end - start) / 60000 + minutes;
       });
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-      if (minutes < 240) {
-        this.$message.error('自定义时段不少于4个小时');
-        return;
-=======
-=======
->>>>>>> Stashed changes
       if (minutes < 120) {
         this.$message.error('自定义时段不少于2个小时');
         return false;
       } else {
         return true;
->>>>>>> Stashed changes
       }
     },
     submit() {