Merge branch 'feature/20201221_开个店平台查询拼单订单_miaohui' into 'qa'

ordercenter-sdk添加markeringType字段

See merge request !99

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

@@ -119,5 +119,6 @@ public class OrderConditionsReq {
     private String appId;
     //是否删除
     private Integer isDeleted;
-
+    //营销活动类型
+    private Integer marketingType;
 }