Commit 2f2dcf48 by 姜海波

Merge remote-tracking branch 'remotes/origin/feature-2020/2/10-1.9.12-开放平台创建订单-海波' into develop

# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
#	order-application-service/pom.xml
parent 7df51c5d
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>assortment-ordercenter-sdk</artifactId> <artifactId>assortment-ordercenter-sdk</artifactId>
<version>1.2.0-SNAPSHOT</version> <version>1.2.1-SNAPSHOT</version>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
<dependency> <dependency>
<groupId>cn.freemud</groupId> <groupId>cn.freemud</groupId>
<artifactId>ordercenter-sdk</artifactId> <artifactId>ordercenter-sdk</artifactId>
<version>1.1.3-SNAPSHOT</version> <version>1.1.4-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.freemud.application.service.sdk</groupId> <groupId>com.freemud.application.service.sdk</groupId>
......
...@@ -23,4 +23,5 @@ ...@@ -23,4 +23,5 @@
| 1.1.7-SNAPSHOT| 1.9.11商品组 | 胡超 | 2020-02-05 | | 1.1.7-SNAPSHOT| 1.9.11商品组 | 胡超 | 2020-02-05 |
| 1.1.8-SNAPSHOT| 核销流程更改 | 侯书虎 | 2020-02-10 | | 1.1.8-SNAPSHOT| 核销流程更改 | 侯书虎 | 2020-02-10 |
| 1.1.9-SNAPSHOT| pos渠道名称 | 丁凯 | 2020-02-11 | | 1.1.9-SNAPSHOT| pos渠道名称 | 丁凯 | 2020-02-11 |
| 1.2.0-SNAPSHOT| 订单查询返回orderType字段 | 侯书虎 | 2020-02-12 | | 1.2.0-SNAPSHOT| 订单查询返回orderType字段 | 侯书虎 | 2020-02-12 |
\ No newline at end of file | 1.2.1-SNAPSHOT| 开放平台创建订单修改 | 姜海波 | 2020-02-17 |
\ No newline at end of file
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