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/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderExtInfoDto.java

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

@@ -138,4 +138,9 @@ public class OrderExtInfoDto {
      * 出场时间
      */
     private String outTime;
+
+    /**
+     * 停车场名称
+     */
+    private String parkingAreaName;
 }