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

liu

5 天以前 d3230d4bb80fbc7c2adb63c588c580ab94234ee8

 src/views/infra/demo/demo03/erp/data.ts

@@ -46,7 +46,7 @@
      componentProps: {
        showTime: true,
        format: 'YYYY-MM-DD HH:mm:ss',
        valueFormat: 'x',
        valueFormat: 'YYYY-MM-DD HH:mm:ss',
        placeholder: '请选择出生日期',
      },
    },