Merge remote-tracking branch 'origin/master'

public/react/src/modules/user/FindPasswordComponent.js

@@ -167,7 +167,7 @@ class LoginRegisterComponent extends Component {
 		}
 		if (this.state.login === undefined|| this.state.login.length ===0 || this.state.login === "") {
 			this.setState({
-				Phonenumberisnotco:"请输入正确的邮箱或手机号",
+				Phonenumberisnotco:"账号不能为空",
 			})
 			return
 		}