Merge remote-tracking branch 'origin/master'

zhangherong

14 小时以前 fcc3f96a76d35abc14210cfcaaf4d218fd194ad3

 src/views/base/modules/factoryManager/SelectUserModal.vue

@@ -34,7 +34,7 @@
      <!-- table区域-begin -->
      <div>
        <a-table
          size="small"
          size="middle"
          bordered
          rowKey="id"
          :columns="columns1"