Commit 0850d671 by shuhu.hou@freemud.cn

Merge branch 'feature/20200325_oms接单' into develop

# Conflicts:
#	order-management/order-management.iml
parents 9c7adfaa 588c59b9
...@@ -84,6 +84,11 @@ ...@@ -84,6 +84,11 @@
<artifactId>deliverycenter-sdk</artifactId> <artifactId>deliverycenter-sdk</artifactId>
<version>1.5.RELEASE</version> <version>1.5.RELEASE</version>
</dependency> </dependency>
<dependency>
<groupId>com.freemud.application.service.sdk</groupId>
<artifactId>takeawaycenter-sdk</artifactId>
<version>1.2.3-SNAPSHOT</version>
</dependency>
<!-- 商户门店sdk --> <!-- 商户门店sdk -->
<dependency> <dependency>
<groupId>com.freemud.application.service.sdk</groupId> <groupId>com.freemud.application.service.sdk</groupId>
......
...@@ -41,11 +41,13 @@ ...@@ -41,11 +41,13 @@
<groupId>com.freemud.application.service.sdk</groupId> <groupId>com.freemud.application.service.sdk</groupId>
<artifactId>takeawaycenter-sdk</artifactId> <artifactId>takeawaycenter-sdk</artifactId>
<version>1.2.3-SNAPSHOT</version> <version>1.2.3-SNAPSHOT</version>
<scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>cn.freemud</groupId> <groupId>cn.freemud</groupId>
<artifactId>assortment-ordercenter-sdk</artifactId> <artifactId>assortment-ordercenter-sdk</artifactId>
<version>1.3.0-SNAPSHOT</version> <version>1.3.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<artifactId>structure-center-sdk</artifactId> <artifactId>structure-center-sdk</artifactId>
......
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