Merge branch 'master' of https://gitee.com/jishenghua/JSH_ERP

.gitignore

@@ -13,3 +13,4 @@ hs_err_pid*
 
 .idea
 
+

pom.xml

@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.jsh</groupId>
   <artifactId>jshERP</artifactId>
-  <version>2017.11.09</version>
+  <version>2017.11.10</version>
   <packaging>war</packaging>  
   <name>jshERP</name> 
   <url>http://git.oschina.net/jishenghua/JSH_ERP</url>