Merge branch 'dev' into 'mp-server-test'

提货订单列表

See merge request quanshu/mp-server!247

mp-service/src/main/java/com/qs/mp/admin/domain/param/UserDeliverOrderQueryParam.java

@@ -24,20 +24,19 @@ public class UserDeliverOrderQueryParam {
 
 	@ApiModelProperty(value = "商品名称", required = false)
 	private String title;
-	
+
 	@ApiModelProperty(value = "订单编号", required = false)
 	private String orderId;
-	
+
 	@ApiModelProperty(value = "订单状态", required = false)
-	@JSONField(serialzeFeatures = SerializerFeature.WriteEnumUsingToString)
-	private DeliverOrderStatusEnum status;
+	private Integer status;
 
 	/**
 	 * 下单区间-开始时间
 	 */
 	@ApiModelProperty(value = "开始时间", required = false)
 	private Date startTime;
-	
+
 	/**
 	 * 下单区间-截止时间
 	 */