Merge branch 'fw-bip' of http://ufidahz.com.cn:9015/root/kangarooDataCenterV3 into 237master
Conflicts: pom.xml
This commit is contained in:
commit
081772d2e3
|
@ -29,7 +29,7 @@
|
|||
<artifactId>pubbaseapp_nccloud_rtLevel</artifactId>
|
||||
<version>1</version>
|
||||
<scope>system</scope>
|
||||
<systemPath>${basedir}/src/main/resources/lib/pubbaseapp_nccloud_rtLevel-1.jar</systemPath>
|
||||
<systemPath>${basedir}/src/main/webapp/WEB-INF/lib/pubbaseapp_nccloud_rtLevel-1.jar</systemPath>
|
||||
</dependency>
|
||||
<!-- <dependency>-->
|
||||
<!-- <groupId>com.hzya.bipyonyoulog</groupId>-->
|
||||
|
|
Loading…
Reference in New Issue