Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

weimingfei

9 天以前 9958c9393c8c3a5e2350fa9023e14cbbf74b0d9a

 admin/src/views/platform/LogisticsRecord/operationCity.vue

@@ -105,7 +105,7 @@
            filed1: 'createDateStart',
            filed2: 'createDateEnd',
            type: 'datetime',
            label: '作业时间'
            label: '创建时间'
          },
          {
            type: 'slot',