Merge branch 'dev/lanpingxiong' into 'master'

Dev/lanpingxiong

See merge request hewei/Jumeirah!24

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

@@ -39,11 +39,14 @@ public class StrokeDiscountQueryVo implements Serializable {
     private String cityArriveName;
     private String cityArriveName;
 
 
     @ApiModelProperty("座位数")
     @ApiModelProperty("座位数")
-    private Integer seatMun;
+    private Integer seatNum;
 
 
     @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

@@ -9,8 +9,9 @@
         city_outset_name,
         city_outset_name,
         city_arrive_id,
         city_arrive_id,
         city_arrive_name,
         city_arrive_name,
-        seat_mun,
+        seat_num,
         plain_type_id,
         plain_type_id,
+        plain_type_name,
         outset_time,
         outset_time,
         return_time,
         return_time,
         status,
         status,
@@ -36,7 +37,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>

config/src/main/resources/config/application.yml

@@ -202,6 +202,8 @@ spring-boot-plus:
       - /app/businessPlain/getPageList
       - /app/businessPlain/getPageList
       # 包机介绍分页列表
       # 包机介绍分页列表
       - /app/charterIntroduction/getPageList
       - /app/charterIntroduction/getPageList
+      # 优惠调机列表分页查询
+      - /app/strokeDiscount/getPageList
 
 
     # 多行字符串权限配置
     # 多行字符串权限配置
     filter-chain-definitions: |
     filter-chain-definitions: |