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

liu

5 天以前 d3230d4bb80fbc7c2adb63c588c580ab94234ee8

 src/views/erp/stock/out/data.ts

@@ -41,7 +41,7 @@
        placeholder: '选择出库时间',
        showTime: true,
        format: 'YYYY-MM-DD HH:mm:ss',
        valueFormat: 'x',
        valueFormat: 'YYYY-MM-DD HH:mm:ss',
      },
      rules: 'required',
    },