Merge branch 'fix' into 'develop'

修改ignore

See merge request o2oa/o2oa!10

.gitignore

@@ -2,7 +2,6 @@
 /.settings/
 .classpath
 .project
-/.settings/
 /target/
 /o2custom/
 /.svn/
@@ -10,4 +9,43 @@
 **/.DS_Store
 .DS_Store
 **/.idea
-/.idea/
\ No newline at end of file
+/.idea/
+# Windows thumbnail cache files
+Thumbs.db
+Thumbs.db:encryptable
+ehthumbs.db
+ehthumbs_vista.db
+# Dump file
+*.stackdump
+# Folder config file
+[Dd]esktop.ini
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+# Windows Installer files
+*.cab
+*.msi
+*.msix
+*.msm
+*.msp
+# Windows shortcuts
+*.lnk
+# Compiled class file
+*.class
+# Log file
+*.log
+# BlueJ files
+*.ctxt
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+# Package Files #
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+#jpa enhance class
+*_.java
\ No newline at end of file