Commit 8b8dc395 by haibo.jiang

Merge branch 'feature-2020/5/25-1.9.24-升级售后查询sdk-海波' into develop

# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
parent 2e6eb39b
...@@ -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.8.2-SNAPSHOT</version> <version>1.8.3-SNAPSHOT</version>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
......
...@@ -74,4 +74,5 @@ ...@@ -74,4 +74,5 @@
| 1.7.8-SNAPSHOT| 预约单接单后提醒时间区分外卖自提 | wuping | 2020-05-18 | | 1.7.8-SNAPSHOT| 预约单接单后提醒时间区分外卖自提 | wuping | 2020-05-18 |
| 1.8.0-SNAPSHOT| 增加订单支付类型 | 海波 | 2020-05-18 | | 1.8.0-SNAPSHOT| 增加订单支付类型 | 海波 | 2020-05-18 |
| 1.8.1-SNAPSHOT| 增加订单支付类型 | 海波 | 2020-05-18 | | 1.8.1-SNAPSHOT| 增加订单支付类型 | 海波 | 2020-05-18 |
| 1.8.2-SNAPSHOT| 升级券码sdk | 胡超 | 2020-05-18 | | 1.8.2-SNAPSHOT| 升级券码sdk | 胡超 | 2020-05-18 |
\ No newline at end of file | 1.8.3-SNAPSHOT| 更新基础sdk1.4.8-SNAPSHOT | 海波 | 2020-05-25 |
\ No newline at end of file
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<version>1.0.0</version> <version>1.0.0</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<version>1.4.7-SNAPSHOT</version> <version>1.4.8-SNAPSHOT</version>
<artifactId>ordercenter-sdk</artifactId> <artifactId>ordercenter-sdk</artifactId>
<dependencies> <dependencies>
......
...@@ -36,4 +36,5 @@ ...@@ -36,4 +36,5 @@
| 1.2.5.RELEASE | 取消接口新增超时时间字段 | wuping | 2020-05-12 | | 1.2.5.RELEASE | 取消接口新增超时时间字段 | wuping | 2020-05-12 |
| 1.4.4-SNAPSHOT | 规范extInfo类 | 侯书虎 | 2020-05-14 | | 1.4.4-SNAPSHOT | 规范extInfo类 | 侯书虎 | 2020-05-14 |
| 1.4.5-SNAPSHOT | 客如云接口 | 海波 | 2020-05-14 | | 1.4.5-SNAPSHOT | 客如云接口 | 海波 | 2020-05-14 |
| 1.4.7-SNAPSHOT | 增加订单支付方式类型 | 海波 | 2020-05-18 | | 1.4.7-SNAPSHOT | 增加订单支付方式类型 | 海波 | 2020-05-18 |
\ No newline at end of file | 1.4.8-SNAPSHOT | 售后ES查询增加跟踪号 | 海波 | 2020-05-25 |
\ 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