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

657a8b06 · 季圣华 · c2cd2520 · 397a3415 · 657a8b06 · 657a8b06
Commit 657a8b06 authored Nov 06, 2017 by 季圣华
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@
 hs_err_pid*

 .idea
+
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
  <modelVersion>4.0.0</modelVersion>
  <groupId>com.jsh</groupId>
  <artifactId>jshERP</artifactId>
-  <version>2017.11.05</version>
+  <version>2017.11.06</version>
  <packaging>war</packaging>  
  <name>jshERP</name> 
  <url>http://git.oschina.net/jishenghua/JSH_ERP</url>