Merge branch 'master' of http://101.36.160.140:21044/depot-yzlt/depot-agile-yzlt.git

Conflicts:
	README.md

.gitignore

@@ -1,14 +1 @@
-# ---> Java
-*.class
-
-# Mobile Tools for Java (J2ME)
-.mtj.tmp/
-
-# Package Files #
-*.jar
-*.war
-*.ear
-
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-hs_err_pid*
-
+/target/

README.md

@@ -1,3 +0,0 @@
-# depot-agile-yunnan
-
-云南出入库取数模块