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

hsy

6 天以前 5a90852489e1bf91d386746d75cfa0066c271228

 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',
    },