Merge remote-tracking branch 'origin/master'

Crunchy

2024-05-06 1f4c79169a0d3ef46f2430b61d4999e1be6261b3

 src/views/product/workbench/productInDialog.vue

@@ -115,6 +115,9 @@
      var query = {}
      this.workstationFeedList = []
      if (this.workstationId && this.workstationId != null) {
        let operationTaskId=JSON.parse(localStorage.getItem("OPERATION_TASK_ID"))
        console.log(operationTaskId,"111111");
        query.operationTaskId=operationTaskId
        getWorkstationFeed(query, this.workstationId)
          .then((response) => {
            var data = response.data