Merge branch 'master' of http://git.ycjcjy.com/zhiyuxing/estateagents-admin-manager

src/pages/channel/InviteClients.jsx

@@ -38,7 +38,7 @@ const columns = [
     dataIndex: 'sex',
     key: 'sex',
     align: 'center',
-    render: (text, record) => <a style={ { color: '#66B3FF' } } >{ record.sex === 1 ? '男' : '女' }</a>,
+    render: (text, record) => <a style={ { color: '#66B3FF' } } >{ record.sex === 1 ? '男' : (record.sex === 2 ? '女':'') }</a>,
   },
 ];
 const header = props => {

src/pages/channel/brokerList.jsx

@@ -172,7 +172,7 @@ return (
       })(<Input/>)}
     </Form.Item>
     <Form.Item >
-   <Button type="primary" htmlType="submit" >保存</Button>
+   <Button type="primary" htmlType="submit" >查询</Button>
      <Button onClick={handleReset} style={{ marginLeft: 18 }}>重置</Button>
     </Form.Item>
    </Form>