Merge branch 'master' of https://gitee.com/jishenghua/JSH_ERP
This commit is contained in:
2
.gitignore
vendored
2
.gitignore
vendored
@@ -11,4 +11,4 @@
|
|||||||
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
|
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
|
||||||
hs_err_pid*
|
hs_err_pid*
|
||||||
|
|
||||||
.idea
|
.idea
|
||||||
4
pom.xml
4
pom.xml
@@ -1,10 +1,10 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<groupId>com.jsh</groupId>
|
<groupId>com.jsh</groupId>
|
||||||
<artifactId>jshERP</artifactId>
|
<artifactId>jshERP</artifactId>
|
||||||
<version>2017.10.09</version>
|
<version>2017.10.13</version>
|
||||||
<packaging>war</packaging>
|
<packaging>war</packaging>
|
||||||
<name>jshERP</name>
|
<name>jshERP</name>
|
||||||
<url>http://git.oschina.net/jishenghua/JSH_ERP</url>
|
<url>http://git.oschina.net/jishenghua/JSH_ERP</url>
|
||||||
|
|||||||
Reference in New Issue
Block a user