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

liu

3 天以前 1c7b0c4e02f351064b9c68ec8f6e85d7665f66ab

 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