update: merge

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

 <template>
   <div class="defineTime">
-    <p class="tips">自定义时段不少于4个小时</p>
+    <p class="tips">自定义时段不少于2个小时</p>
     <el-form :model="form" ref="defineTime">
       <div class="flex" v-for="(v, i) in form.timeRangeList" :key="i">
         <el-form-item class="mt10" :prop="'timeRangeList.' + i + '.startTime'" :rules="[{ validator: validateTime(i) }, { validator: validateStarTime(v, i) }]">
@@ -124,7 +124,7 @@ export default {
       }
       this.form.timeRangeList.push({});
     },
-    // 提交时校验是否超过4小时
+    // 提交时校验是否超过2小时
     handleCallTime() {
       let minutes = 0;
       this.form.timeRangeList.forEach(item => {
@@ -132,9 +132,17 @@ export default {
         let start = new Date(new Date().toLocaleDateString() + ' ' + item.startTime).getTime();
         minutes = (end - start) / 60000 + minutes;
       });
+<<<<<<< Updated upstream
       if (minutes < 240) {
         this.$message.error('自定义时段不少于4个小时');
         return;
+=======
+      if (minutes < 120) {
+        this.$message.error('自定义时段不少于2个小时');
+        return false;
+      } else {
+        return true;
+>>>>>>> Stashed changes
       }
     },
     submit() {