Merge branch 'master' of http://119.23.210.103:3000/wy/zdqy_firm_former

src/views/business/attendance/makeUpEdit.vue

@@ -62,6 +62,7 @@
           v-model="formData.buKaShiJian"
           type="datetime"
           format="yyyy-MM-dd HH:mm"
+          value-format="yyyy-MM-dd HH:mm"
           :placeholder="readonly ? '' : '请选择时间'"
           :disabled="readonly"
         />