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

liu

3 天以前 c6ce881a26895edc9e89aea8317be15572f48b23

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

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