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

src/pages/property/proprietor/Detail.jsx

         phone : taUser.phone,
         nickname : taUser.nickname,
         openid: taUser.openid,
-        idNo: taUser.idNo,
+        idCard: taUserVerify.idCard,
         avatarurl: taUser.avatarurl,
         ownerName: taUserVerify.ownerName,
         verifyStatus: taUserVerify.verifyStatus + '',
           <Descriptions.Item label="手机号">{userData.phone}</Descriptions.Item>
           <Descriptions.Item label="微信昵称">{userData.nickname}</Descriptions.Item>
           <Descriptions.Item label="微信ID">{userData.openid}</Descriptions.Item>
-          <Descriptions.Item label="身份证">{userData.idNo}</Descriptions.Item>
+          <Descriptions.Item label="身份证">{userData.idCard}</Descriptions.Item>
           <Descriptions.Item label="头像">
             <img src={userData.avatarurl} alt="" style={{ width: '128px', height: '128px' }}/>
           </Descriptions.Item>