Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0

liu

3 天以前 1c7b0c4e02f351064b9c68ec8f6e85d7665f66ab

 src/views/mes/pro/workorder/modules/process-list.vue

@@ -156,9 +156,8 @@
          keyFlag: item.keyFlag,
          checkFlag: item.checkFlag,
          backflushFlag: item.backflushFlag,
          outputItemId: item.outputItemId,
          outputItemCode: item.outputItemCode,
          outputItemName: item.outputItemName,
          outputItemIds: item.outputItemIds,
          outputItemNames: item.outputItemNames,
          remark: item.remark,
          bomItems: item.bomItems,
        }));