Merge branch 'master' into v3.5

src/components/SelectButton/BuildSelect.jsx

@@ -37,7 +37,7 @@ const BuildingSelect = (props) => {
   },[])
 
   const getCityList = (e) => {
-    request({ ...apis.building.buildingSelect, params: {pageNum: 1,pageSize: 999}, }).then((data) => {
+    request({ ...apis.building.getList, params: {pageNum: 1,pageSize: 999}, }).then((data) => {
         setData(data.records)
         // 默认选中第一个
         if (props.checkFirst) {

src/pages/staff/list/StaffList.jsx

@@ -65,7 +65,7 @@ const CartBody = (props) => {
 
     <Card className={Styles.card}>
       <div>
-        <Avatar src={data.avatar} style={{ width: '0.48rem', height: '0.48rem' }} />
+        <Avatar src={data.photo} style={{ width: '0.48rem', height: '0.48rem' }} />
         <Button type="link" style={{color: '#FF925C', fontSize: '0.106rem',position: 'absolute', top: '40px', left: '0.56rem' }} onClick={toEditStaff(data.userId)}>
           编辑
                 <Icon type="form" style={{ color: '#C0C4CC', marginLeft: '0.04rem' }} />