Merge branches 'develop' and 'feature/20200619_停车场订单sdk_wuping' of…

Merge branches 'develop' and 'feature/20200619_停车场订单sdk_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop

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

ordercenter-sdk/pom.xml

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

ordercenter-sdk/readme.md

@@ -38,3 +38,4 @@
         | 1.4.19-SNAPSHOT | 新增停车场订单es查询接口 | wuping | 2020-06-23 |
         | 1.4.20-SNAPSHOT | 增加小程序打开场景值scene | 李小二 | 2020-06-24 |
         | 1.4.21-SNAPSHOT | 增加payCode 支付渠道码 | 李小二 | 2020-06-28 |
+        | 1.4.22-SNAPSHOT| es综合查询新增appId查询条件 | wuping | 2020-06-30 |
\ No newline at end of file

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

@@ -115,5 +115,7 @@ public class OrderConditionsReq {
     //异常单状态
     private List<Integer> abnormalStatuses;
 
+    //应用ID
+    private String appId;
 
 }