Merge remote-tracking branch 'origin/master'
# Conflicts: # len-sys/len-sys.iml # len-web/len-web.iml
This commit is contained in:
commit
217e66617f
|
@ -4,3 +4,4 @@
|
||||||
len-web/target/
|
len-web/target/
|
||||||
len-core/target/
|
len-core/target/
|
||||||
len-sys/target/
|
len-sys/target/
|
||||||
|
*.iml
|
||||||
|
|
|
@ -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>
|
||||||
|
|
Loading…
Reference in New Issue