登录用户信息

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserEditBo.java

@@ -22,9 +22,6 @@ public class UserEditBo {
     @ApiModelProperty("$column.columnComment")
     private Long userId;
 
-    /** 账号 */
-    @ApiModelProperty("账号")
-    private String userAccout;
 
     /** 昵称 */
     @ApiModelProperty("昵称")
@@ -70,9 +67,6 @@ public class UserEditBo {
     @ApiModelProperty("入学时间")
     private Long entranceTime;
 
-    /** $column.columnComment */
-    @ApiModelProperty("$column.columnComment")
-    private String openId;
 
     /** 学籍证明照片 */
     @ApiModelProperty("学籍证明照片")
@@ -110,8 +104,27 @@ public class UserEditBo {
     @ApiModelProperty("状态 1正常 0关闭")
     private Integer status;
 
+    /** 区 */
+    @ApiModelProperty("区")
+    private String district;
+
+    /** 结婚状态 */
+    @ApiModelProperty("结婚状态")
+    private String marry;
+
+    /** 户籍省份 */
+    @ApiModelProperty("户籍省份")
+    private String houseProvince;
+
+    /** 户籍城市 */
+    @ApiModelProperty("户籍城市")
+    private String houseCity;
+
+    /** 户籍区 */
+    @ApiModelProperty("户籍区")
+    private String houseDistrict;
+
     public void setNull(){
-        this.setOpenId(null);
         this.setTelphone(null);
         this.setIdCard(null);
     }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/domain/User.java

@@ -111,4 +111,19 @@ private static final long serialVersionUID=1L;
     private Integer certified;
 
     private Long certifiedTime;
+
+    /** 区 */
+    private String district;
+
+    /** 结婚状态 */
+    private String marry;
+
+    /** 户籍省份 */
+    private String houseProvince;
+
+    /** 户籍城市 */
+    private String houseCity;
+
+    /** 户籍区 */
+    private String houseDistrict;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/UserVo.java

@@ -113,6 +113,26 @@ public class UserVo {
 	private Integer certified;
 	@ApiModelProperty("人脸认证时间")
 	private Long certifiedTime;
+	/** 区 */
+	@Excel(name = "区")
+	@ApiModelProperty("区")
+	private String district;
+	/** 结婚状态 */
+	@Excel(name = "结婚状态")
+	@ApiModelProperty("结婚状态")
+	private String marry;
+	/** 户籍省份 */
+	@Excel(name = "户籍省份")
+	@ApiModelProperty("户籍省份")
+	private String houseProvince;
+	/** 户籍城市 */
+	@Excel(name = "户籍城市")
+	@ApiModelProperty("户籍城市")
+	private String houseCity;
+	/** 户籍区 */
+	@Excel(name = "户籍区")
+	@ApiModelProperty("户籍区")
+	private String houseDistrict;
 
 	public void setNull(){
 		this.setOpenId(null);

zhongzheng-system/src/main/resources/mapper/modules/user/UserMapper.xml

@@ -35,6 +35,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="lastLoginTime" column="last_login_time"/>
         <result property="certified" column="certified"/>
         <result property="certifiedTime" column="certified_time"/>
+        <result property="district" column="district"/>
+        <result property="marry" column="marry"/>
+        <result property="houseProvince" column="house_province"/>
+        <result property="houseCity" column="house_city"/>
+        <result property="houseDistrict" column="house_district"/>
     </resultMap>