Merge branch 'master' of http://120.79.193.119:9090/r/huge/frontEnd/hugeOA

liyj

2020-09-07 f7e9b835c30e5b3287b2c04e24950871cafa907d

 src/components/common/HeadView/index.jsx

@@ -70,7 +70,7 @@
                  (loginUser && Object.keys(loginUser).length) &&
                  <Row type="flex" align="middle" justify="space-between" >
                    <Col>
                      <Select value={role} size="small" style={{ marginLeft: 20, width: 120 }} onChange={value => {
                      {/* <Select value={role} size="small" style={{ marginLeft: 20, width: 120 }} onChange={value => {
                        setContext({ role: value });
                        history.push('/')
                      }}>
@@ -79,7 +79,7 @@
                            <Option value={key} key={key}>{name}</Option>
                          ))
                        }
                      </Select>
                      </Select> */}
                    </Col>
                    <Col style={{ marginRight: 40 }}>
                      {loginUser.trueName}&nbsp;&nbsp;&nbsp;