fix

public/react/src/modules/ecs/curriculum/Curriculum.js

@@ -272,7 +272,6 @@ class Curriculum extends Component {
 						render={(props) => (<EcCompletionCalculation {...this.props} {...props} {...this.state} Ontitine={(i) => this.Ontitine(i)} triggerRef={this.bindRef} />)}></Route>
 				</Switch>
 			</div>
-			</div>
 		)
 	}
 

public/react/src/modules/forums/MemoDetail.js

@@ -861,8 +861,6 @@ class MemoDetail extends Component {
 
           </div>
         </div>
-          </div>
-        </div >
 
       </React.Fragment >
     );

public/react/src/modules/forums/MemoDetailMDEditor.js

@@ -109,15 +109,6 @@ class MemoDetailMDEditor extends Component {
 	}
 
 	showEditor() {
-<<<<<<< HEAD
-		$("html, body").animate({ scrollTop: $('.commentInput:visible').offset().top - 100 }, 1000, () => {
-			if (this.commentMDEditor) {
-				this.commentMDEditor.cm.focus()
-			} else {
-				this.onMockInputClick()
-			}
-		});
-=======
 		// $("html, body").animate({ scrollTop: $('.commentInput:visible').offset().top - 100 }, 1000, () => {
 		// 	if (this.commentMDEditor) {
 		// 		this.commentMDEditor.cm.focus()
@@ -125,7 +116,6 @@ class MemoDetailMDEditor extends Component {
 		// 		this.onMockInputClick()
 		// 	}
 		// 	});
->>>>>>> f8dfb5f... 调整
 	}
 	close = () => {
 		this.setState({ isInited: false })