Merge branch 'master-vehicle-memeber' into dev

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/vo/UserMemberVo.java

@@ -3,6 +3,8 @@ package com.github.wxiaoqi.security.admin.vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.persistence.Column;
+
 
 /**
  * 用户会员
@@ -113,4 +115,6 @@ public class UserMemberVo {
 	@ApiModelProperty("会员名")
 	private String memberName;
 
+	@Column(name = "member_type")
+	private Integer memberType;
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/PublicController.java

@@ -115,6 +115,7 @@ public class PublicController {
             UserMemberVo memberVo=userMemberBiz.getMemberInfoByUserId(userid);
             if(memberVo!=null){
                 BeanUtils.copyProperties(userDTO,memberVo);
+                userDTO.setMemberType(memberVo.getMemberType());
             }
         }
         AppUserPosition userPosition=positionBiz.selectById(positionId);

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

@@ -20,6 +20,7 @@
         <result property="updTime" column="upd_time"/>
         <result property="isDel" column="is_del"/>
         <result property="memberName" column="member_name"/>
+        <result property="memberType" column="member_type"/>
     </resultMap>
 
     <select id="getInfoByUserId" resultMap="baseUserMemberMap">