Commit 5f086fa0 by 姜海波

更新最新master代码

parent 406d05fb
......@@ -61,7 +61,7 @@
<dependency>
<groupId>cn.freemud.commons</groupId>
<artifactId>commons-amqp</artifactId>
<version>1.4.12-release</version>
<version>2.1.0-release</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
......
......@@ -99,6 +99,12 @@
<dependency>
<groupId>cn.freemud.commons</groupId>
<artifactId>commons-dao</artifactId>
<exclusions>
<exclusion>
<artifactId>mybatis-spring-boot-starter</artifactId>
<groupId>org.mybatis.spring.boot</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<artifactId>assortment-data-manager</artifactId>
......@@ -124,7 +130,7 @@
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>druid</artifactId>
<version>1.1.10</version>
<version>1.1.2</version>
</dependency>
<dependency>
<groupId>com.github.pagehelper</groupId>
......@@ -245,12 +251,6 @@
<artifactId>springfox-swagger-ui</artifactId>
<version>2.7.0</version>
</dependency>
<!-- rabbitMq-->
<dependency>
<groupId>cn.freemud.commons</groupId>
<artifactId>commons-amqp</artifactId>
<version>1.4.1-release</version>
</dependency>
<!-- 券码SDK -->
<dependency>
<groupId>com.freemud.card.sdk</groupId>
......@@ -315,7 +315,6 @@
<dependency>
<groupId>tk.mybatis</groupId>
<artifactId>mapper-spring-boot-starter</artifactId>
<version>2.0.2</version>
</dependency>
<dependency>
<groupId>com.ctrip.framework.apollo</groupId>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment