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

liu

2 天以前 950e1332f89e3d18a8f4b415bd4fe274dce1e954

 src/views/mes/workbench/components/tabs/ReturnIssueFormModal.vue

@@ -117,7 +117,7 @@
        format: 'YYYY-MM-DD HH:mm:ss',
        placeholder: '请选择退料日期',
        showTime: true,
        valueFormat: 'x',
        valueFormat: 'YYYY-MM-DD HH:mm:ss',
      },
    },
    {