冲突合并

liuyg

2021-04-26 7c4b47852e921718259c3e27421f44f8d2edb7fc

 src/views/clientManagement/clientManagement_copy.vue

@@ -234,7 +234,7 @@
        option: {
          height: 'auto',
          indexLabel: '序号',
          calcHeight: 80,
          calcHeight: 54,
          labelWidth: '100',
          dialogWidth: 950,
          menuWidth: 250,