Merge branch 'master' of

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

tiku_App/src/com/offcn/test/APITest_tk.java

@@ -90,7 +90,7 @@ public class APITest_tk extends BasicsGM{
 	  
 	  //数据回写
 //	  HashMap<String, Object> ExpectResult=MapUtil.Expect(data);
-//	  SheetUtils sheet = new SheetUtils("DataAll.xls", "Output");
+//	  SheetUtils sheet = new SheetUtils("DataAllWff.xls", "Output");
 //	  sheet.writeExcel(
 //			  		data.get("NO").toString(),
 //				  	data.get("TCNO").toString() + "_Step" + data.get("Step").toString(),

tiku_App/src/resources/test.properties

-xls=DataAll.xls
+xls=DataAllWff.xls
 sheet=TestCase
 mysql_local_Online=local
 Percentage=60
\ No newline at end of file