Merge remote-tracking branch 'origin/master'

zss

2023-12-27 a47cd0e2e3cbb43b4db5273cd30e7da53d24dfa0

 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) => {