Merge branch 'master' of http://git.ycjcjy.com/xiangsong/xs-manage

src/pages/property/contact/components/Editor.jsx

 import React, { useEffect, useState } from 'react'
-import { Form, Modal, Button, Input, InputNumber } from 'antd'
+import { Form, Modal, Button, Input, InputNumber, Select } from 'antd'
 
 const formItemLayout = {
   labelCol: {
             props.form.getFieldDecorator('remark')(<Input placeholder="请填写备注" />)
           }
         </Form.Item>
+        <Form.Item label="物业类型">
+          {props.form.getFieldDecorator('type')(
+            <Select defaultValue="prop" placeholder="物业类型">
+              <Option value="prop">物业电话</Option>
+              <Option value="common">公共服务</Option>
+            </Select>,
+          )}
+        </Form.Item>
         <Form.Item {...tailFormItemLayout}>
           <Button type="primary" htmlType="submit">确定</Button>
           <Button onClick={props.onCancel} style={{ marginLeft: '48px' }}>取消</Button>

src/pages/property/contact/index.jsx

       <List dataSource={listData} loading={loading} pagination={pagination} onPageChange={handlePageChange} rowKey="id">
         <Table.Column title="名称" dataIndex="name" key="name" />
         <Table.Column title="电话" dataIndex="tel" key="tel" />
+        <Table.Column title="物业类型" dataIndex="type" key="type" render={(item, row) => (
+          <span>{item == "prop" ? "物业电话" : "公共服务电话"}</span>
+        )}/>
         <Table.Column title="备注" dataIndex="remark" key="remark" />
         <Table.Column title="操作" dataIndex="id" key="id" width="200px" render={(_, row) => (
           <>