Merge branch 'dev/lanpingxiong' into 'master'

# 优化

See merge request hewei/Jumeirah!52

api-app/src/main/java/com/jumeirah/api/app/controller/PlainTypeController.java

@@ -55,7 +55,7 @@ public class PlainTypeController extends BaseController {
             PlainTypeBo plainTypeBo;
             for (List<PlainType> listTemp: resultMap.values()) {
                 plainTypeBo = new PlainTypeBo();
-                plainTypeBo.setTitle(listTemp.get(0).getSeriesName())
+                plainTypeBo.setType(listTemp.get(0).getSeriesType())
                         .setPlainTypeList(listTemp);
                 plainTypeBoList.add(plainTypeBo);
             }

api-app/src/main/java/com/jumeirah/api/app/entity/bo/PlainTypeBo.java

 package com.jumeirah.api.app.entity.bo;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.jumeirah.common.entity.PlainType;
 import io.geekidea.springbootplus.framework.common.entity.BaseEntity;
-import io.geekidea.springbootplus.framework.core.validator.groups.Update;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
 import java.util.List;
 
 /**
@@ -28,8 +23,8 @@ import java.util.List;
 public class PlainTypeBo extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    @ApiModelProperty("系列名称")
-    private String title;
+    @ApiModelProperty("系列类型，0-尊享系列 , 1-奢享系列 ,2-普通系列")
+    private Integer type;
 
     @ApiModelProperty("系列名称")
     private List<PlainType> plainTypeList;

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

 package com.jumeirah.common.entity;
 
-import io.geekidea.springbootplus.framework.common.entity.BaseEntity;
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.Version;
 import com.baomidou.mybatisplus.annotation.TableId;
+import io.geekidea.springbootplus.framework.common.entity.BaseEntity;
+import io.geekidea.springbootplus.framework.core.validator.groups.Update;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -12,9 +12,6 @@ import lombok.experimental.Accessors;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
-
-import io.geekidea.springbootplus.framework.core.validator.groups.Update;
-
 import java.sql.Timestamp;
 
 /**
@@ -36,13 +33,9 @@ public class PlainType extends BaseEntity {
     private Long id;
 
     @NotNull(message = "系列类型不能为空")
-    @ApiModelProperty("系列类型")
+    @ApiModelProperty("系列类型，0-尊享系列 , 1-奢享系列 ,2-普通系列")
     private Integer seriesType;
 
-    @ApiModelProperty("系列名称")
-    private String seriesName;
-
-
     @NotBlank(message = "飞机名称不能为空")
     @ApiModelProperty("飞机名称")
     private String name;

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

@@ -6,7 +6,6 @@ import lombok.Data;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
-import java.util.Date;
 
 /**
  * <pre>
@@ -25,7 +24,7 @@ public class PlainTypeQueryVo implements Serializable {
     @ApiModelProperty("主键ID")
     private Long id;
 
-    @ApiModelProperty("系列类型")
+    @ApiModelProperty("系列类型，0-尊享系列 , 1-奢享系列 ,2-普通系列")
     private Integer seriesType;
 
     @ApiModelProperty("飞机名称")