调整

public/react/src/modules/question/Question.js

@@ -952,12 +952,21 @@ class Question extends Component {
 						: ""
 				}
 				{
+<<<<<<< HEAD
 					visible === true ?
 						<div
 							style={{
 								marginTop: "60px"
 							}}></div>
 						: ""}
+=======
+					visible===true?
+				<div
+				style={{
+					marginTop: "82px"
+				}}></div>
+				:""}
+>>>>>>> e686e4c... 调整
 				{
 					modalsTypes === true ?
 						<QuestionModals {...this.props}{...this.state} modalsTypes={modalsTypes} modalCancels={() => this.modalCancels()}