Merge branch 'master' of http://121.40.234.130:7788/gongbaoxiong/ouLun_wms

# Conflicts:
#	README.md

.gitignore

@@ -0,0 +1,36 @@
+# ---> Java
+# 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*
+
+# ---> Vue
+# gitignore template for Vue.js projects
+#
+# Recommended template: Node.gitignore
+
+# TODO: where does this rule come from?
+docs/_book
+
+# TODO: where does this rule come from?
+test/
+

README.md

@@ -1,3 +1,3 @@
 # nladmin-platform
 
-欧伦电气项目
+欧伦电气项目