Merge branch 'master' of http://114.132.189.42:9002/r/product-inventory-man...

chenrui

9 天以前 4b6ed9aec826d49abc239f8d768bfecb91eceabc

 .gitignore

@@ -25,6 +25,8 @@
*.iml

*.ipr



### JRebel ###

rebel.xml

### NetBeans ###

nbproject/private/

build/*

@@ -37,6 +39,7 @@
# Others

*.log

*.xml.versionsBackup

*.swp



!*/build/*.java

!*/build/*.html