Merge branch 'dev/lanpingxiong' into 'master'

Dev/lanpingxiong

See merge request hewei/Jumeirah!53

api-merchant/src/main/java/com/jumeirah/api/merchant/entity/param/McStrokeDiscountAddParam.java

@@ -45,8 +45,4 @@ public class McStrokeDiscountAddParam extends BaseEntity {
     @ApiModelProperty("价格")
     private BigDecimal money;
 
-    @NotNull(message = "行程类型不能为空")
-    @ApiModelProperty("行程类型，0-单程，1-往返行程，2-货运，3-医疗")
-    private Integer type;
-
 }