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

src/components/XForm/WrapperItem.jsx

   DatePicker,
   TimePicker,
   Select,
+  Switch,
 } from 'antd';
 import ImageUploader from './ImageUpload';
 

src/pages/activity/editActivity.jsx

           { required: true, message: '请输入活动人数' },
         ]
       },
+      {
+        label: '最大报名人数',
+        name: 'maxEnlistByPerson',
+        type: FieldTypes.Text,
+        value: dynamicData.maxEnlistByPerson,
+        rules: [
+          { required: true, message: '请输入最大报名人数' },
+        ]
+      },
       {
         label: '活动详情',
         name: 'desc',

src/pages/staff/list/StaffList.jsx

 
 const header = (props) => {
   const [tempData, setTempData] = useState([])
+  const [pageTotal, setPageTotal] = useState('')
   useEffect(() => {
     getList({ pageNum: 1, pageSize: 10 });
   }, [])
     request({ ...apis.staff.taUser, params: { ...params } }).then((data) => {
       console.log(data, "listData")
       setTempData(data.records)
+      setPageTotal(data.total)
     })
   }
 
 
       {/* 分页  */}
       <div style={{ display: 'flex', justifyContent: 'flex-end' }}>
-        <Pagination showQuickJumper defaultCurrent={1} total={tempData.total} onChange={onChange} />
+        <Pagination showQuickJumper defaultCurrent={1} total={pageTotal} onChange={onChange} />
       </div>
     </>
   )

src/pages/staff/list/editStaff.jsx

       placeholder: '请输入职位',
       value: userData.position
     },
+    {
+      label: '是否置业顾问',
+      name: 'isConsultant',
+      type: FieldTypes.Switch,
+      value: userData.isConsultant
+    },
     {
       label: '电话',
       name: 'phone',