Merge branch 'dev/lanpingxiong' into 'master'

# 用户下单功能

See merge request hewei/Jumeirah!19

common/src/main/java/com/jumeirah/common/vo/StrokeDetailVo.java

@@ -56,7 +56,7 @@ public class StrokeDetailVo implements Serializable {
 
 
     @NotNull(message = "人数不能为空")
     @NotNull(message = "人数不能为空")
     @ApiModelProperty("人数")
     @ApiModelProperty("人数")
-    private Integer peopleMun;
+    private Integer peopleNum;
 
 
     @NotNull(message = "飞机型号ID不能为空")
     @NotNull(message = "飞机型号ID不能为空")
     @ApiModelProperty("飞机型号ID")
     @ApiModelProperty("飞机型号ID")
@@ -155,4 +155,4 @@ public class StrokeDetailVo implements Serializable {
     @ApiModelProperty("审核状态,0审核中,1审核通过,2审核未通过")
     @ApiModelProperty("审核状态,0审核中,1审核通过,2审核未通过")
     private Integer auditStatus;
     private Integer auditStatus;
 
 
-}
+}
\ No newline at end of file