Merge remote-tracking branch 'origin/master'

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

@@ -838,7 +838,7 @@ class LoginRegisterComponent extends Component {
                             ><span className="font-14 "  style={{
                                 color: '#676767',
                             }}>我已阅读并同意服务协议条款</span></Checkbox>
-                            <Button className=" font-16" type="primary" style={{height:"46px", width: "100%",marginBottom:"26px"}} onClick={() => this.postregistered()}
+                            <Button className=" font-16" type="primary" style={{height:"46px", width: "100%",marginTop:"26px"}} onClick={() => this.postregistered()}
                                     size={"large"}>注册</Button>