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

hsy

5 天以前 5a90852489e1bf91d386746d75cfa0066c271228

 src/views/system/tenant/data.ts

@@ -102,7 +102,7 @@
      component: 'DatePicker',
      componentProps: {
        format: 'YYYY-MM-DD',
        valueFormat: 'x',
        valueFormat: 'YYYY-MM-DD',
        placeholder: '请选择过期时间',
      },
      rules: 'required',