Merge remote-tracking branch 'origin/develop' into develop

public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfpeopledata.js

@@ -376,7 +376,7 @@ class CompetitionContentspdfpeopledata extends Component {
 		return (
 			<div className="flexdidirectionss mt17">
 				{this.state.certification === 1 ?
-					<RealNameCertificationModal  {...this.props} {...this.state} basicInfo={this.state.basicInfo}
+					<RealNameCertificationModal  {...this.props} {...this.state} basicInfo={userdata}
 																			 wrappedComponentRef={(form) => this.realNameCertificationModal1 = form}
 																			 certification={certification}
 																			 Getdata={() => this.getdata()}
@@ -384,7 +384,7 @@ class CompetitionContentspdfpeopledata extends Component {
 				></RealNameCertificationModal> : ""}
 
 				{this.state.certification === 2 ?
-					<RealNameCertificationModal  {...this.props} {...this.state} basicInfo={this.state.basicInfo}
+					<RealNameCertificationModal  {...this.props} {...this.state} basicInfo={userdata}
 																			 wrappedComponentRef={(form) => this.realNameCertificationModal2 = form}
 																			 certification={certification}
 																			 Getdata={() => this.getdata()}
@@ -499,7 +499,7 @@ class CompetitionContentspdfpeopledata extends Component {
 				{/*手机号绑定*/}
 				{
 					phonebool === true ?
-						<Phonenumberverifications {...this.props} {...this.state} basicInfo={this.state.basicInfo}
+						<Phonenumberverifications {...this.props} {...this.state} basicInfo={userdata}
 																			hideUpdating={(i) => this.hideUpdating(i)}
 																			getdata={() => this.getdata()}></Phonenumberverifications>
 						: ""
@@ -514,7 +514,7 @@ class CompetitionContentspdfpeopledata extends Component {
 				</div>
 				{
 					emailbool === false ? "" :
-						<Mailboxvalidations  {...this.props} {...this.state} basicInfo={this.state.basicInfo}
+						<Mailboxvalidations  {...this.props} {...this.state} basicInfo={userdata}
 																 hideUpdating={(i) => this.hideUpdating(i)}
 																 getdata={() => this.getdata()}></Mailboxvalidations>
 				}