Merge remote-tracking branch 'origin/master'

cuilei

7 天以前 7edd931aa33aa0f4fff9a89e1bc1a064c3709035

 src/views/system/UserList.vue

@@ -338,12 +338,12 @@
              //   width: 100,
              //   dataIndex: 'phone'
              // },
              {
                title: '岗位',
                align: "center",
                width: 80,
                dataIndex: 'post_dictText'
              },
              // {
              //   title: '岗位',
              //   align: "center",
              //   width: 80,
              //   dataIndex: 'post_dictText'
              // },
              {
                title: '车间',
                align: "center",
@@ -409,12 +409,12 @@
              //   width: 100,
              //   dataIndex: 'phone'
              // },
              {
                title: '岗位',
                align: "center",
                width: 80,
                dataIndex: 'post_dictText'
              },
              // {
              //   title: '岗位',
              //   align: "center",
              //   width: 80,
              //   dataIndex: 'post_dictText'
              // },
              {
                title: '部门',
                align: "center",