Merge branches 'develop' and 'feature/20200226_支付宝模板消息_wuping' of…

Merge branches 'develop' and 'feature/20200226_支付宝模板消息_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop

# Conflicts:
#	ordercenter-sdk/pom.xml
#	ordercenter-sdk/readme.md

order-application-service/pom.xml

@@ -70,7 +70,7 @@
         <dependency>
             <groupId>com.freemud.sdk.api.assortment</groupId>
             <artifactId>assortment-messagepush-sdk</artifactId>
-            <version>2.6.1.RELEASE</version>
+            <version>2.6.2-SNAPSHOT</version>
             <exclusions>
                 <exclusion>
                     <groupId>cn.freemud.commons</groupId>

ordercenter-sdk/pom.xml

@@ -8,7 +8,7 @@
         <version>1.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <version>1.1.5-SNAPSHOT</version>
+    <version>1.1.6-SNAPSHOT</version>
     <artifactId>ordercenter-sdk</artifactId>
 
     <dependencies>

ordercenter-sdk/readme.md

@@ -12,4 +12,5 @@
 | 1.1.2.RELEASE| 农工商订单submit  | 侯书虎 | 2020-01-13  |
 | 1.1.4-SNAPSHOT| 开放平台专用创建订单接口 | 姜海波 | 2020-02-17  |
 | 1.1.5-SNAPSHOT | 优化活动订单 | 胡超 | 2020-02-10 |
-| 1.1.3.RELEASE| 开放平台创建订单  | 姜海波 | 2020-02-24  |
\ No newline at end of file
+| 1.1.3.RELEASE| 开放平台创建订单  | 姜海波 | 2020-02-24  |
+| 1.1.6-SNAPSHOT | OrderExtInfo新增formId | wuping | 2020-02-27 |
\ No newline at end of file

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderExtInfoDto.java

@@ -19,6 +19,8 @@ public class OrderExtInfoDto {
 
     private  String prepayId;
 
+    private  String formId;
+
     private String accessToken;
     /**
      * 到期时间