Merge branch 'master' of git.picaiba.com:CaiXiang/cigs4 into yanyang
Conflicts: ym-packing/pom.xml
This commit is contained in:
@@ -33,5 +33,10 @@
|
||||
<version>1.0-SNAPSHOT</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.cnbm</groupId>
|
||||
<artifactId>ym-dynamic-datasource</artifactId>
|
||||
<version>1.0-SNAPSHOT</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</project>
|
||||
Reference in New Issue
Block a user