冲突合并

liuyg

2021-04-26 7c4b47852e921718259c3e27421f44f8d2edb7fc

 src/views/realTimePolice/realHistory.vue

@@ -113,7 +113,7 @@
      option: {
        height: "auto",
        indexLabel: "序号",
        calcHeight: 30,
        calcHeight: 54,
        menuWidth: 240,
        size: "mini",
        border: false,