Merge remote-tracking branch 'origin/base-modify' into base-modify

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

@@ -82,7 +82,7 @@ public class AppUserVo {
 	@ApiModelProperty(value = "邀请人id:")
 	private  Integer inviterAccount;
 
-	@ApiModelProperty(value = "1-新人用户；2-未激活；3-激活:")
+	@ApiModelProperty(value = "1-未激活；2-激活:")
 	private  Integer state;
 
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/mapper/AppUserDetailMapper.java

@@ -12,7 +12,7 @@ import java.util.List;
 public interface AppUserDetailMapper extends Mapper<AppUserDetail> {
 
     //查询用户信息
-    public AppUserVo getUserInfo(@Param("userId") Integer userId);
+     AppUserVo getUserInfo(@Param("userId") Integer userId);
 
     List<AppUserManageVo> selectAppUserManage(AppUserManageDTO appUserManageDTO);
 

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

@@ -30,6 +30,7 @@
         <result column="source" property="source"/>
         <result column="code" property="code"/>
         <result column="invitera_ccount" property="inviterAccount"/>
+        <result column="state" property="state"/>
     </resultMap>