Merge branch 'master' of https://gitlab.eoffcn.com/lyy56980/study.git

Conflicts:
	studycenter_Api_auto_test/testng.xml

studycenter_Api_auto_test/testng.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
-<suite name="Suite" parallel="none">
-    <listeners>
-		<listener class-name="org.uncommons.reportng.HTMLReporter" />
-		<listener class-name="org.uncommons.reportng.JUnitXMLReporter" />
-	</listeners> <!-- -->
-
-  <test name="Test">
-    <classes>
-      <class name="com.offcn.test.APITest_study"/>
-    </classes>
-  </test> 
-  
-  <!--
-  <test name="Test1">
-    <classes>
-      <class name="com.offcn.TestUnti.Mail"/>
-    </classes>
-  </test>  Test -->
-  
-</suite> <!-- Suite -->