Merge branch 'fix_gitignore' into 'develop'

modify gitignore See merge request o2oa/o2oa!13

Merge branch 'fix_gitignore' into 'develop'
modify gitignore See merge request o2oa/o2oa!13
4c167540 · 周睿 · b6135cbd · 86581f1a · 4c167540 · b6135cbd
3 changed file
--- a/.gitignore
+++ b/.gitignore
@@ -48,4 +48,5 @@ $RECYCLE.BIN/
 # 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
+*.iml
\ No newline at end of file
--- a/o2server/x_jpush_assemble_control/x_jpush_assemble_control.iml
+++ b/o2server/x_jpush_assemble_control/x_jpush_assemble_control.iml
--- a/o2server/x_jpush_core_entity/x_jpush_core_entity.iml
+++ b/o2server/x_jpush_core_entity/x_jpush_core_entity.iml