Commit abd1757d by yu.sun

sunyu::update::fix conflicts

parents 1a3bb492 3c091dcb
......@@ -10,7 +10,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>assortment-shoppingcart-sdk</artifactId>
<version>1.9.12-SNAPSHOT</version>
<version>2.0.2-SNAPSHOT</version>
<dependencies>
<dependency>
......
......@@ -45,7 +45,8 @@
<dependency>
<groupId>cn.freemud</groupId>
<artifactId>assortment-shoppingcart-sdk</artifactId>
<version>2.0.1-SNAPSHOT</version>
<!-- <version>1.1.5.RELEASE</version>-->
<version>2.0.2-SNAPSHOT</version>
</dependency>
<!-- 再来一单查询订单信息 -->
<dependency>
......
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