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

优化

See merge request quanshu/mp-server!484

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

@@ -31,8 +31,7 @@ public class UserTicketOrderQueryParam {
     private String phone;
 
     @ApiModelProperty("订单状态;-1 已取消 0:待付款 1:已完成")
-    @JSONField(serialzeFeatures = SerializerFeature.WriteEnumUsingToString)
-    private UserTicketOrderStatusEnum status;
+    private Integer status;
 
     @ApiModelProperty("开始时间")
     private Date startTime;