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

liu

昨天 c6ce881a26895edc9e89aea8317be15572f48b23

 src/views/mes/tm/tool/data.ts

@@ -183,7 +183,7 @@
      componentProps: {
        format: 'YYYY-MM-DD HH:mm:ss',
        showTime: true,
        valueFormat: 'x',
        valueFormat: 'YYYY-MM-DD HH:mm:ss',
      },
      dependencies: {
        triggerFields: ['maintenType'],