Merge branch 'master-vehicle-memeber' into dev

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/BaseUserMemberVO.java

 package com.github.wxiaoqi.security.admin.dto;
 
-import java.io.Serializable;
-import java.util.Date;
-import javax.persistence.*;
-
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import java.io.Serializable;
+
 /**
  * 用户会员信息
  */
@@ -80,4 +81,6 @@ public class BaseUserMemberVO implements Serializable {
 
     private Integer discount;
 
+    @Column(name = "member_type")
+    private Integer memberType;
 }

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/UserMemberDTO.java

@@ -71,4 +71,7 @@ public class UserMemberDTO  {
 	@Column(name = "member_name")
 	@ApiModelProperty("会员名")
     private String memberName;
+
+	@Column(name = "member_type")
+	private Integer memberType;
 }

ace-modules/ace-admin/src/main/resources/mapper/BaseUserMemberMapper.xml

@@ -40,7 +40,8 @@
         m.valid_time as validTime,
         m.member_name as memberName,
         m.discount as discount,
-        ml.name as name
+        ml.name as name,
+        m.member_type as memberType
         from
         base_user_member m
         left join

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/AddOrUpdateVehicleVo.java

@@ -171,4 +171,7 @@ public class AddOrUpdateVehicleVo {
      * 电子保单
      */
     private String insurancePDF;
+
+    //可用会员类型
+    private Integer memberUse;
 }
\ No newline at end of file

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/ResultVehicleVo.java

@@ -181,4 +181,8 @@ public class ResultVehicleVo {
     private Date receiveTime;
 
     private Integer modelId;
+
+
+    //可用会员类型
+    private Integer memberUse;
 }
\ No newline at end of file

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleMapper.xml

@@ -70,6 +70,7 @@
         v.receive_time,
         v.update_time,
         v.model_id,
+        v.member_use,
         v.mileage_last_update as mileage,
         c.val as useTypeName,
         vm.name as vehicleType