合并冲突

licp

2024-04-29 ea1a8cf41c11f8f533cea594e1f1c03640cf4a96

 src/views/plan/masterproductionschedule/auto-manufacturingorder.vue

@@ -417,7 +417,6 @@
    },
    getWorkShopOptions() {
      remote('work_shop').then((response) => {
        console.log("高压",response);
        if (response.data.code === 0) {
          this.workShopOptions = response.data.data
        } else {