123

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/AppUserDetail.java

 package com.github.wxiaoqi.security.admin.entity;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.persistence.Column;
@@ -31,6 +32,7 @@ public class AppUserDetail {
 	private Long createtime;
 	private Long updatetime;
 	private Integer isdel;
+	//渠道来源；1-app；2-小程序
 	private Integer channel;
 	/**
 	 * 省份编号
@@ -54,4 +56,22 @@ public class AppUserDetail {
 	 */
 	@Column(name = "upd_host")
 	private  String updHost;
+
+
+	@ApiModelProperty(value = "用户职位")
+	@Column(name = "position_id")
+	private  Integer positionId;
+
+	@ApiModelProperty(value = "用户来源:0-自来,1-用户邀请")
+	@Column(name = "source")
+	private  Integer source;
+
+
+	@ApiModelProperty(value = "邀请码")
+	@Column(name = "code")
+	private  String code;
+
+	@ApiModelProperty(value = "邀请人id:")
+	@Column(name = "inviter_account")
+	private  String inviterAccount;
 }

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

 package com.github.wxiaoqi.security.admin.feign.dto;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -20,6 +21,40 @@ public class AppUserDTO {
 	private String birthday;
 	private String personSign;
 	private String remark;
+	//渠道来源；1-app；2-小程序
+	private Integer channel;
+	/**
+	 * 省份编号
+	 */
+	private Integer provinceCode;
+
+	/**
+	 * 市编号
+	 */
+	private Integer cityCode;
+
+	/**
+	 * 创建ip
+	 */
+	private  String crtHost;
+	/**
+	 * 更新ip
+	 */
+	private  String updHost;
+
+
+	@ApiModelProperty(value = "用户职位")
+	private  Integer positionId;
+
+	@ApiModelProperty(value = "用户来源:0-自来,1-用户邀请")
+	private  Integer source;
+
+
+	@ApiModelProperty(value = "邀请码")
+	private  String code;
+
+	@ApiModelProperty(value = "邀请人id:")
+	private  String inviterAccount;
 	private Integer imUserid;
 	private String wxOpenid;
 	private String unionid;

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

 package com.github.wxiaoqi.security.admin.vo;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -46,5 +47,39 @@ public class AppUserVo {
 	private String personSign;
 	//备注
 	private String remark;
+	//渠道来源；1-app；2-小程序
+	private Integer channel;
+	/**
+	 * 省份编号
+	 */
+	private Integer provinceCode;
+
+	/**
+	 * 市编号
+	 */
+	private Integer cityCode;
+
+	/**
+	 * 创建ip
+	 */
+	private  String crtHost;
+	/**
+	 * 更新ip
+	 */
+	private  String updHost;
+
+
+	@ApiModelProperty(value = "用户职位")
+	private  Integer positionId;
+
+	@ApiModelProperty(value = "用户来源:0-自来,1-用户邀请")
+	private  Integer source;
+
+
+	@ApiModelProperty(value = "邀请码")
+	private  String code;
+
+	@ApiModelProperty(value = "邀请人id:")
+	private  String inviterAccount;
 
 }

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

@@ -8,7 +8,6 @@ import com.github.wxiaoqi.security.admin.biz.BaseUserMemberBiz;
 import com.github.wxiaoqi.security.admin.entity.*;
 import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
 import com.github.wxiaoqi.security.admin.vo.AppUserGroups;
-import com.github.wxiaoqi.security.admin.vo.AppUserInfoVo;
 import com.github.wxiaoqi.security.admin.vo.AppUserVo;
 import com.github.wxiaoqi.security.admin.vo.UserMemberVo;
 import com.github.wxiaoqi.security.auth.client.config.UserAuthConfig;
@@ -20,11 +19,8 @@ import com.github.wxiaoqi.security.common.util.Query;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.beanutils.BeanUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 

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

@@ -21,6 +21,15 @@
     <result column="sex"  property="sex" />
     <result column="person_sign"  property="personSign" />
     <result column="remark" property="remark" />
+    <result column="channel" property="channel" />
+    <result column="province_code" property="provinceCode" />
+    <result column="city_code" property="cityCode" />
+    <result column="crt_host" property="crtHost" />
+    <result column="upd_host" property="updHost" />
+    <result column="position_id" property="positionId" />
+    <result column="source" property="source" />
+    <result column="code" property="code" />
+    <result column="invitera_ccount" property="inviterAccount" />
   </resultMap>