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

liu

2 天以前 c6ce881a26895edc9e89aea8317be15572f48b23

 src/views/mes/pro/andon/record/data.ts

@@ -275,7 +275,7 @@
              format: 'YYYY-MM-DD HH:mm:ss',
              placeholder: '请选择处置时间',
              showTime: true,
              valueFormat: 'x',
              valueFormat: 'YYYY-MM-DD HH:mm:ss',
            },
          },
          isUpdate