liuchang/biz_service_ebtp_extend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/origin/uat' into dev

Browse Source 
# Conflicts:
#	pom.xml
This commit is contained in:
zhangyx
2021-11-12 09:48:26 +08:00
parent 480b02904d 7580d91910
commit 739ba6d06d
11 changed files with 442 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
pom.xml
View File

@ -7,7 +7,7 @@
<parent>
<groupId>com.chinaunicom.ebtp</groupId>
<artifactId>mall-ebtp-cloud-parent</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>2.0.0-SNAPSHOT</version>
</parent>
<groupId>com.chinaunicom.mall.ebtp</groupId>
@ -20,29 +20,10 @@
<dependency>
<groupId>com.chinaunicom.mall.ebtp</groupId>
<artifactId>uboot-core</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.chinaunicom.ebtp</groupId>
<artifactId>mall-ebtp-cloud-attachment-sdk</artifactId>
</dependency>
<dependency>
<groupId>com.chinaunicom.ebtp</groupId>
<artifactId>mall-ebtp-cloud-apollo-starter</artifactId>
<version>2.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
</dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
<artifactId>sharding-jdbc-spring-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>com.deepoove</groupId>
<artifactId>poi-tl</artifactId>
@ -98,9 +79,9 @@
<dependency>
<groupId>cryp.access</groupId>
<artifactId>accessToken</artifactId>
<version>1.0</version>
<version>1.3</version>
<scope>system</scope>
<systemPath>${basedir}/lib/access_token1.1.jar</systemPath>
<systemPath>${basedir}/lib/access_token1.3.jar</systemPath>
</dependency>
<dependency>