Merge branch 'master' of http://git.cncdc.org.cn/DING/my-study-project

+# Windows-specific files that require CRLF:
+*.bat       eol=crlf
+*.txt       eol=crlf
+
+# Unix-specific files that require LF:
+*.java      eol=lf
+*.sh        eol=lf

+target/
+!.mvn/wrapper/maven-wrapper.jar
+
+## STS ##
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+
+## IntelliJ IDEA ##
+.idea
+*.iws
+*.iml
+*.ipr
+vcs.xml
+workspace.xml
+
+## JRebel ##
+rebel.xml
+
+## MAC ##
+.DS_Store
+
+## Other ##
+logs/
+temp/
+.idea