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

云

8 天以前 410ec378d80800fe26fc822059acd0575c85f635

 src/views/mes/pro/feedback/data.ts

@@ -554,7 +554,7 @@
        format: 'YYYY-MM-DD HH:mm:ss',
        placeholder: '请选择报工时间',
        showTime: true,
        valueFormat: 'x',
        valueFormat: 'YYYY-MM-DD HH:mm:ss',
      },
      rules: 'required',
    },