Merge branch 'dev' of http://git.local.topsunit.com/mes/mes-ui into dev

src/views/mes/md/sapData/index.vue

@@ -34,7 +34,7 @@
         <el-date-picker clearable
                         v-model="queryParams.uploadTime"
                         type="date"
-                        value-format="yyyy-MM-dd hh:mm:ss"
+                        value-format="yyyy-MM-dd HH:mm:ss"
                         placeholder="请选择上传sap时间">
         </el-date-picker>
       </el-form-item>

src/views/mes/pro/schedule/index.vue

@@ -356,7 +356,7 @@
               <el-date-picker
                 v-model="form.startTime"
                 type="datetime"
-                value-format="yyyy-MM-dd hh:mm:ss"
+                value-format="yyyy-MM-dd HH:mm:ss"
                 placeholder="请选择开始时间"
               >
               </el-date-picker>