From b2c9c8f5f734b61605883e97abbe36aa1043cc3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Sat, 29 Jun 2019 09:21:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

# Conflicts:
#	public/react/src/modules/courses/shixunHomework/Listofworks.js
---
 .../shixunHomework/Shixunworkdetails/ShixunWorkModal.js   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js b/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js
index a1dd68ad0..55f44d971 100644
--- a/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js
+++ b/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js
@@ -154,10 +154,10 @@ class ShixunWorkModal extends Component{
 			this.props.showNotification(`请先选择分班`);
 			return
 		}
-		if(group_ids&&group_ids.length < 2){
-			this.props.showNotification(`有效作品数少于2个，无法查重`);
-			return
-		}
+		// if(group_ids&&group_ids.length < 2){
+		// 	this.props.showNotification(`有效作品数少于2个，无法查重`);
+		// 	return
+		// }
 
 		let url="/homework_commons/"+this.props.match.params.homeworkid+"/homework_code_repeat.json";
 		axios.post(url, {