Merge remote-tracking branch 'origin/master'

# Conflicts:
#	len-sys/len-sys.iml
#	len-web/len-web.iml
This commit is contained in:
zxm 2018-01-14 17:50:23 +08:00
commit 217e66617f
2 changed files with 11 additions and 1 deletions

1
.gitignore vendored
View File

@ -4,3 +4,4 @@
len-web/target/ len-web/target/
len-core/target/ len-core/target/
len-sys/target/ len-sys/target/
*.iml

View File

@ -23,7 +23,16 @@
<groupId>com.len</groupId> <groupId>com.len</groupId>
<artifactId>len-core</artifactId> <artifactId>len-core</artifactId>
</dependency> </dependency>
<dependency>
<groupId>cn.lenos</groupId>
<artifactId>yunmaozj-common</artifactId>
<version>0.0.7</version>
</dependency>
<dependency>
<groupId>com.lenos</groupId>
<artifactId>lenos-common</artifactId>
<version>0.0.1</version>
</dependency>
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>