Merge branch 'master' of

https://gitlab.eoffcn.com/ys65701/tiku_APP_APITest.git

Conflicts:
	tiku_App/TestData/DataAllWff.xls
	tiku_App/src/com/offcn/api/tk/app3/getPaperStatusNwn.java
	tiku_App/src/com/offcn/api/tk/app3/releaseScoreToStudent.java

tiku_App/src/com/offcn/api/tk/app3/releaseScoreToStudent.java

@@ -39,9 +39,9 @@ import net.sf.json.JSONObject;
 
 public class releaseScoreToStudent extends TK implements API {
 	public String parameter;//参数集合
-
+
 	public String record_id_excel;//试卷使用记录id
-
+
 	public String record_id;//试卷使用记录id
 	
 	
@@ -50,7 +50,7 @@ public class releaseScoreToStudent extends TK implements API {
 		if (!isProduct && data.get("CleanDB").toString().contains("Y")) {
 			cleanUser_FromDB();//清除注册用户根据user_id
 		}
-
+
 		
 		try {
 			String sql = "SELECT use_id FROM `t_paper_use_record` WHERE  is_statis = 2 AND is_done =1 AND is_release =0 AND channel <>1 LIMIT 1";
@@ -74,7 +74,7 @@ public class releaseScoreToStudent extends TK implements API {
 			
 			e.printStackTrace();
 		}
-
+
 	}
 
 	@Override