Merge branch 'master' of

http://git.qmth.com.cn/xiatian/dd-college-export.git

Conflicts:
	src/main/java/cn/com/qmth/export/CourseInfo.java

src/main/java/cn/com/qmth/export/CourseInfo.java

@@ -1,8 +1,7 @@
 package cn.com.qmth.export;
 
 public class CourseInfo {
-	private String id2 ;
-	private String id  ;
+	private String id;
 	private String name;
 	private String code;
 	public String getId() {