冲突合并

liuyg

2021-04-26 7c4b47852e921718259c3e27421f44f8d2edb7fc

 src/views/system/user.vue

@@ -261,7 +261,7 @@
        },
        option: {
          height: 'auto',
          calcHeight: 80,
          calcHeight: 54,
          tip: false,
          searchShow: true,
          searchMenuSpan: 6,