From 6922e2338b6b500f79837bc7684f0e05dc8db52e Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 12 Jul 2021 20:14:58 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_enterprises

---
 src/views/dispatchChild/data.js |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/views/dispatchChild/data.js b/src/views/dispatchChild/data.js
index 8630d5b..70e0392 100644
--- a/src/views/dispatchChild/data.js
+++ b/src/views/dispatchChild/data.js
@@ -129,7 +129,7 @@
         // overHidden: true
     }, {
         label: "结束时间",
-        prop: "dispatchertime",
+        prop: "endTime",
         type: "date",
         format: "yyyy-MM-dd hh:mm:ss",
         valueFormat: "timestamp",

--
Gitblit v1.9.3