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

Administrator

2021-08-19 7264485acdd440ac75807fa6f91b09bcdf4f2051

 src/views/people/expression.vue

@@ -156,7 +156,7 @@
        height: "auto",
        widtd: "auto",
        calcHeight: 54,
        border: false,
        border: true, //liu
        stripe: true,
        tip: false,
        index: true,