冲突解决

CD配唱片

2025-04-25 ebb4fa8dad778cc663726668698cc90f7bf0d8e6

冲突解决

 src/views/mainPlan/platePlanList/index.vue

@@ -171,19 +171,11 @@
    field: "documentNumber",
    width: 200,
  },
<<<<<<< HEAD
  {
    title: "当前工序号",
    field: "currentProcessNumberTxt",
    width: 150,
  },
=======
  // {
  //   title: "当前工序号",
  //   field: "processNumber",
  //   width: 150,
  // },
>>>>>>> 8c613f17337c8e7fc68a12d02cafa05d0dca81ba
  {
    title: "需求分类",
    field: "requirementType",