Merge remote-tracking branch 'origin/master'

zss

2024-01-18 c205e0765ae18536a5b15b5ecbd5d3d0558b57fc

 src/views/plan/segmentmerge/operation-technology-form.vue

@@ -215,7 +215,6 @@
          })
        }
      })
      console.log('resultList', resultList)
      if (resultList.length > 0 && resultList[0].routingList.length > 0) {
        let flag = true
        resultList.forEach((ele) => {