Merge branch 'master' of http://192.168.0.105:10010/r/zhba_enterprises

Administrator

2021-07-14 f78a56ba2e2c3cf48a0809a824e306a578cefd00

 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",