# 优惠调机

common/src/main/java/com/jumeirah/common/entity/StrokeDiscount.java

@@ -57,6 +57,9 @@ public class StrokeDiscount extends BaseEntity {
     @ApiModelProperty("飞机型号ID")
     @ApiModelProperty("飞机型号ID")
     private Long plainTypeId;
     private Long plainTypeId;
 
 
+    @ApiModelProperty("飞机型号名称")
+    private String plainTypeName;
+
     @NotNull(message = "出发时间不能为空")
     @NotNull(message = "出发时间不能为空")
     @ApiModelProperty("出发时间")
     @ApiModelProperty("出发时间")
     private Timestamp outsetTime;
     private Timestamp outsetTime;

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

@@ -44,6 +44,9 @@ public class StrokeDiscountQueryVo implements Serializable {
     @ApiModelProperty("飞机型号ID")
     @ApiModelProperty("飞机型号ID")
     private Long plainTypeId;
     private Long plainTypeId;
 
 
+    @ApiModelProperty("飞机型号名称")
+    private String plainTypeName;
+
     @ApiModelProperty("出发时间")
     @ApiModelProperty("出发时间")
     private Timestamp outsetTime;
     private Timestamp outsetTime;
 
 

common/src/main/resources/mapper/StrokeDiscountMapper.xml

@@ -36,7 +36,6 @@
         from stroke_discount sd
         from stroke_discount sd
         INNER JOIN city_three_code ctco ON ctco.id = sd.city_outset_id
         INNER JOIN city_three_code ctco ON ctco.id = sd.city_outset_id
         INNER JOIN city_three_code ctca ON ctca.id = sd.city_arrive_id
         INNER JOIN city_three_code ctca ON ctca.id = sd.city_arrive_id
-
     </select>
     </select>
 
 
 </mapper>
 </mapper>